Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

pom.xml

@@ -125,23 +125,12 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.33</version>
         </dependency>
-        <!--加载jwt-->
+        <!--https://blog.csdn.net/AdminGuan/article/details/100147488-->
+        <!--JWT,用于鉴权-->
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-api</artifactId>
-            <version>0.11.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-impl</artifactId>
-            <version>0.11.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-jackson</artifactId>
-            <version>0.11.2</version>
-            <scope>runtime</scope>
+            <artifactId>jjwt</artifactId>
+            <version>0.7.0</version>
         </dependency>
         <!--引用json库-->
         <dependency>

src/main/java/UnitTest/JWT.java

@@ -0,0 +1,21 @@
+package UnitTest;
+
+import io.jsonwebtoken.Claims;
+
+public class JWT {
+    public static void main(String[] args) {
+        String Authorization = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJkYXRlIjoiVHVlIEF1ZyAwNiAxMzozNzowNSBDU1QgMjAyNCIsInBob25lIjoiMTM3NTY1MTE5OTAiLCJ0eXBlIjoiV1giLCJ1c2VySWQiOiI5NDMxMiJ9.LhDheTMd_dZjR_0_cCT7aNy9waC105gMwmon7j5xPUPEmuiuZ2tToSWnjMVvzzWTKMvsvr7oZZXDJcr6h_Kv9g";
+        String token = Authorization.replaceFirst(JwtUtil.AUTHORIZATION_STARTER, "");
+        Claims cs = JwtUtil.getClaimsFromToken(token, JwtUtil.SECRET);
+
+        System.out.println(cs);
+        //String secret, String userId,String phone, String date,String type
+        //String jwt = JwtUtil.generateToken(JwtUtil.SECRET, "1", "18686619970", "2021-09-01 00:00:00", "1");
+        //System.out.println(jwt);
+
+        //String operatorId = (String) cs.get(JwtUtil.CLAIM_KEY_OPERATORID);
+        //String tokenTmp = JwtUtil.generateToken(token, JwtUtil.SECRET, operatorId, String.valueOf(cs.getExpiration()));
+
+        //System.out.println(tokenTmp);
+    }
+}

src/main/java/UnitTest/JwtUtil.java

@@ -0,0 +1,90 @@
+package UnitTest;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by zhzhan on 2017/6/30.
+ */
+public class JwtUtil {
+
+    public static final String AUTHORIZATION_MONITOR_STARTER="Monitor ";
+    public static final String AUTHORIZATION_STARTER = "Bearer ";
+    public static final String CLAIM_KEY_USERID = "userId";
+    public static final String CLAIM_KEY_OPERATORID = "operatorId";
+
+    public static final String CLAIM_KEY_PHONE = "phone";
+    public static final String CLAIM_KEY_DATE = "date";
+    public static final String CLAIM_KEY_TYPE = "type";
+    public static final String SECRET = "ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM";
+    public static final String     CLAIM_MONITOR_ACCOUNT_NAME="accountName";
+    public static String generateToken(String secret, String userId,String phone,String type) {
+        Date date = new Date();
+        return generateToken(secret, userId,phone, date.toString(),type);
+    }
+
+    public static String generateToken(String secret, String userId,String phone, String date,String type) {
+        Map<String, Object> claims = new HashMap<>();
+        claims.put(JwtUtil.CLAIM_KEY_USERID, userId);
+        claims.put(JwtUtil.CLAIM_KEY_PHONE, phone);
+        claims.put(JwtUtil.CLAIM_KEY_DATE, date);
+        claims.put(JwtUtil.CLAIM_KEY_TYPE, type);
+        return Jwts.builder()
+                .setClaims(claims)
+//                .setExpiration(date)
+                .signWith(SignatureAlgorithm.HS512, secret) //采用什么算法是可以自己选择的，不一定非要采用HS512
+                .compact();
+    }
+
+
+    public static String generateTokenMonitor(String secret, String userId,String phone,String type,String accountName) {
+        Date date = new Date();
+        return generateTokenMonitor(secret, userId,phone, date.toString(),type,accountName);
+    }
+
+    public static String generateTokenMonitor(String secret, String userId,String phone, String date,String type,String accountName) {
+        Map<String, Object> claims = new HashMap<>();
+        claims.put(JwtUtil.CLAIM_KEY_USERID, userId);
+        claims.put(JwtUtil.CLAIM_KEY_PHONE, phone);
+        claims.put(JwtUtil.CLAIM_KEY_DATE, date);
+        claims.put(JwtUtil.CLAIM_KEY_TYPE, type);
+        claims.put(JwtUtil.CLAIM_MONITOR_ACCOUNT_NAME, accountName);
+        return Jwts.builder()
+                .setClaims(claims)
+//                .setExpiration(date)
+                .signWith(SignatureAlgorithm.HS512, secret) //采用什么算法是可以自己选择的，不一定非要采用HS512
+                .compact();
+    }
+
+
+    public static String generateToken(String secret, String operatorId, Date date) {
+        Map<String, Object> claims = new HashMap<>();
+        claims.put(JwtUtil.CLAIM_KEY_OPERATORID, operatorId);
+        return Jwts.builder()
+                .setClaims(claims)
+                .setExpiration(date)
+                .signWith(SignatureAlgorithm.HS512, secret) //采用什么算法是可以自己选择的，不一定非要采用HS512
+                .compact();
+    }
+
+
+    public static Claims getClaimsFromToken(String token, String secret) {
+        Claims claims;
+        try {
+            claims = Jwts.parser()
+                    .setSigningKey(secret)
+                    .parseClaimsJws(token)
+                    .getBody();
+        } catch (Exception e) {
+            claims = null;
+        }
+        return claims;
+    }
+
+
+}

src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java

@@ -901,7 +901,7 @@ public class ZbdcModel {
                     null, null, null, null, null,
                     null, null, null, null, null,
                     null, null, null, null, null, null, null, null, null, null,
-                    0,0,0,0,0,0,0,0);
+                    0, 0, 0, 0, 0, 0, 0, 0);
         }
 
         sql = "select km_code,km_name from t_zbdc_templet where templet_id=?";
@@ -1526,31 +1526,37 @@ public class ZbdcModel {
         if (StrKit.isBlank(keyword)) keyword = "";
         Page<Record> p;
         Map<String, Record> _map = getSchoolAreaName();
-        String tSql = "select *,(xx_ldjy_qt_sum+cz_ldjy_qt_sum) as summary_ldjy_qt_sum,(xx_ck_js_sum+cz_ck_js_sum+gz_ck_js_sum) as summary_ck_js_sum,(xx_ck_mj_sum+cz_ck_mj_sum+gz_ck_mj_sum) as summary_ck_mj_sum,";
+        String tSql = "select t1.*,(xx_ldjy_qt_sum+cz_ldjy_qt_sum) as summary_ldjy_qt_sum,(xx_ck_js_sum+cz_ck_js_sum+gz_ck_js_sum) as summary_ck_js_sum,(xx_ck_mj_sum+cz_ck_mj_sum+gz_ck_mj_sum) as summary_ck_mj_sum,";
+        //药品室
+        tSql += "cz_hxypsshu+gz_hxypsshu as summary_hxypsshu,cz_hxypsmj+gz_hxypsmj as summary_hxypsmj,";
+        tSql += "cz_swypsshu+gz_swypsshu as summary_swypsshu,cz_swypsmj+gz_swypsmj as summary_swypsmj,";
         //护眼灯教室 护眼灯功能室
         tSql += "xx_hjddjzsks+xx_hjddwjzsks as xx_hydjs,xx_hjddjzgnqshu+xx_hjddwjzgnqshu as xx_hydgns,";
         tSql += "cz_hjddjzsks+cz_hjddwjzsks as cz_hydjs,cz_hjddjzgnqshu+cz_hjddwjzgnqshu as cz_hydgns,";
         tSql += "gz_hjddjzsks+gz_hjddwjzsks as gz_hydjs,gz_hjddjzgnqshu+gz_hjddwjzgnqshu as gz_hydgns,";
-        tSql += "xx_hjddjzsks+xx_hjddwjzsks +cz_hjddjzsks+cz_hjddwjzsks+gz_hjddjzsks+gz_hjddwjzsks as summary_hydjs,xx_hjddjzgnqshu+xx_hjddwjzgnqshu+cz_hjddjzgnqshu+cz_hjddwjzgnqshu+gz_hjddjzgnqshu+gz_hjddwjzgnqshu as summary_hydgns";
+        tSql += "xx_hjddjzsks+xx_hjddwjzsks +cz_hjddjzsks+cz_hjddwjzsks+gz_hjddjzsks+gz_hjddwjzsks as summary_hydjs,xx_hjddjzgnqshu+xx_hjddwjzgnqshu+cz_hjddjzgnqshu+cz_hjddwjzgnqshu+gz_hjddjzgnqshu+gz_hjddwjzgnqshu as summary_hydgns,";
+
+        //每个学段的班级数量
+        tSql += "t2.xx_class_count,t2.cz_class_count,t2.gz_class_count";
 
         if (StrKit.isBlank(bureau_id)) {
             if (!StrKit.isBlank(area_id)) {
                 String bureauIds = getBureauIds(area_id, school_type_id, keyword);
                 if (StrKit.isBlank(bureauIds)) {
-                    p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb where 1=2");
+                    p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb as t1 inner join t_zbdc_bureau_base as t2 on t1.bureau_id=t2.bureau_id and t1.year=t2.year where 1=2");
                 } else {
-                    p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb where bureau_id in (" + bureauIds + ") and year=" + year + " order by bureau_id");
+                    p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb as t1 inner join t_zbdc_bureau_base as t2 on t1.bureau_id=t2.bureau_id and t1.year=t2.year where t1.bureau_id in (" + bureauIds + ") and t1.year=" + year + " order by t1.bureau_id");
                 }
             } else {
                 if (school_type_id > 0) {
                     String school_type_name = getSchoolTypeName(school_type_id);
-                    p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb where year=" + year + " and school_type_name='" + school_type_name + "' and bureau_name like '%" + keyword + "%'  order by bureau_id");
+                    p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb as t1 inner join t_zbdc_bureau_base as t2 on t1.bureau_id=t2.bureau_id and t1.year=t2.year where t1.year=" + year + " and t1.school_type_name='" + school_type_name + "' and t1.bureau_name like '%" + keyword + "%'  order by bureau_id");
                 } else {
-                    p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_name like '%" + keyword + "%'  order by bureau_id");
+                    p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb as t1 inner join t_zbdc_bureau_base as t2 on t1.bureau_id=t2.bureau_id and t1.year=t2.year where t1.year=" + year + " and t1.bureau_name like '%" + keyword + "%'  order by t1.bureau_id");
                 }
             }
         } else {
-            p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_id='" + bureau_id + "'");
+            p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb as t1 inner join t_zbdc_bureau_base as t2 on t1.bureau_id=t2.bureau_id and t1.year=t2.year where t1.year=" + year + " and t1.bureau_id='" + bureau_id + "'");
         }
 
         //配备情况
@@ -1710,6 +1716,88 @@ public class ZbdcModel {
                 }
             }
         }
+        /*
+
+
+        (3)区域汇总，以上学科各教室实建室数大于应建室数的，按应建室数统计（多出部分不纳入到统计中）
+        */
+        for (int i = 0; i < p.getList().size(); i++) {
+            Record record = p.getList().get(i);
+            //(1)小学科学：实验室增加应建室数
+            // 实验室应建室数生成规则：班级数≤12，应建1间；12<班级数≤24，应建2间；24<班级数，应建3间
+            // int xx_kxsysshshu = record.getInt("xx_kxsysshshu");//小学科学实验室数量
+            int xx_class_count = record.getInt("xx_class_count");//小学班级数量
+            if (xx_class_count <= 12) {
+                record.set("xx_kxsysshshu_need", 1);
+            } else if (xx_class_count > 12 && xx_class_count <= 24) {
+                record.set("xx_kxsysshshu_need", 2);
+            } else {
+                record.set("xx_kxsysshshu_need", 3);
+            }
+            // (2)初/高物理、化学、生物
+            // 实验室增加应建室数（应建室数生成规则同小学科学）
+            int cz_class_count = record.getInt("cz_class_count");//初中班级数量
+            if (cz_class_count <= 12) {
+                record.set("cz_wllshshshu_need", 1);//初中物理实验室应建室数
+                record.set("cz_hxlshshshu_need", 1);//初中化学实验室应建室数
+                record.set("cz_swlshshshu_need", 1);//初中生物实验室应建室数
+            } else if (cz_class_count > 12 && cz_class_count <= 24) {
+                record.set("cz_wllshshshu_need", 2);
+                record.set("cz_hxlshshshu_need", 2);
+                record.set("cz_swlshshshu_need", 2);
+            } else {
+                record.set("cz_wllshshshu_need", 3);
+                record.set("cz_hxlshshshu_need", 3);
+                record.set("cz_swlshshshu_need", 3);
+            }
+            int gz_class_count = record.getInt("gz_class_count");//高中班级数量
+            if (gz_class_count <= 12) {
+                record.set("gz_wllshshshu_need", 1);//高中物理实验室应建室数
+                record.set("gz_hxlshshshu_need", 1);//高中化学实验室应建室数
+                record.set("gz_swlshshshu_need", 1);//高中生物实验室应建室数
+            } else if (gz_class_count > 12 && gz_class_count <= 24) {
+                record.set("gz_wllshshshu_need", 2);
+                record.set("gz_hxlshshshu_need", 2);
+                record.set("gz_swlshshshu_need", 2);
+            } else {
+                record.set("gz_wllshshshu_need", 3);
+                record.set("gz_hxlshshshu_need", 3);
+                record.set("gz_swlshshshu_need", 3);
+            }
+            // 3、仪器室、准备室、药品室增加应建室数，均为1间
+            if (cz_class_count > 0) {
+                //初中生物
+                record.set("cz_swyqshshu_need", 1);//仪器室数量
+                record.set("cz_swzbrshshu_need", 1);//准备室数量
+                record.set("cz_swypsshu_need", 1);//药品室数量
+
+                //初中化学
+                record.set("cz_hxyqshshu_need", 1);//仪器室数量
+                record.set("cz_hxzbrshshu_need", 1);//准备室数量
+                record.set("cz_hxypsshu_need", 1);//药品室数量
+
+                //初中物理
+                record.set("cz_wllyqshshu_need", 1);//仪器室数量
+                record.set("cz_wllzbrshshu_need", 1);//准备室数量
+            }
+
+            if (gz_class_count > 0) {
+                //高中生物
+                record.set("gz_swyqshshu_need", 1);//仪器室数量
+                record.set("gz_swzbrshshu_need", 1);//准备室数量
+                record.set("gz_swypsshu_need", 1);//药品室数量
+
+                //高中化学
+                record.set("gz_hxyqshshu_need", 1);//仪器室数量
+                record.set("gz_hxzbrshshu_need", 1);//准备室数量
+                record.set("gz_hxypsshu_need", 1);//药品室数量
+
+                //高中物理
+                record.set("gz_wllyqshshu_need", 1);//仪器室数量
+                record.set("gz_wllzbrshshu_need", 1);//准备室数量
+            }
+
+        }
         return p;
     }
 
@@ -2730,7 +2818,7 @@ public class ZbdcModel {
         map.put("jtr", "教室");
         map.put("lsys", "实验室");
         map.put("lsysjs", "实验室");
-        map.put("yps","药品室");
+        map.put("yps", "药品室");
 
         //获取区域ID和区域名称
         Kv areaKv = getAreaIdAndName(bureau_id);