统计分析

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java

@@ -624,70 +624,88 @@ public class UserServiceImpl implements IUserService {
         int insertNum = 0;
         int updateNum = 0;
         for (int i = 0; i < dataArr.size(); i++) {
-            JSONObject jsonObject = dataArr.getJSONObject(i);
-            // 通过登录名判断用户是否存在
+            try {
+                JSONObject jsonObject = dataArr.getJSONObject(i);
+                // 通过登录名判断用户是否存在
 //            checkLoginNameUnique(jsonObject.getString("username"));
-            if (StringUtils.isEmpty(jsonObject.getString("username"))) { continue; }
+                if (StringUtils.isEmpty(jsonObject.getString("username"))) {
+                    continue;
+                }
 
-            try {
-                // 返回每条拉取的成功情况
-                String taskId = jsonObject.getString("taskId");
-                String params = "{\"token\":\""+token+"\",[{\"taskId\":\""+taskId+"\",\"result\":\"SUCCESS\"}]}";
-                connect("/ebus/sfrzhqxglmk/sysDoneTacc", params);
-            }catch (Exception e){
-                log.info("用户数据下拉完成异常，异常任务id：{}",jsonObject.getString("taskId"));
-                e.printStackTrace();
-            }
+                try {
+                    // 返回每条拉取的成功情况
+                    String taskId = jsonObject.getString("taskId");
+                    String params = "{\"token\":\"" + token + "\",[{\"taskId\":\"" + taskId + "\",\"result\":\"SUCCESS\"}]}";
+                    connect("/ebus/sfrzhqxglmk/sysDoneTacc", params);
+                } catch (Exception e) {
+                    log.info("用户数据下拉完成异常，异常任务id：{}", jsonObject.getString("taskId"));
+                    e.printStackTrace();
+                }
 
-            User user = new User();
-            user.setDeptId(jsonObject.getString("organizationId"));
-            user.setOrganizationId(jsonObject.getString("organizationId"));
-            user.setStrUserId(jsonObject.getString("userId"));
-            user.setSrzUserid(jsonObject.getString("srzUserId"));
-            user.setFullname(jsonObject.getString("fullname"));
-            user.setUserName(jsonObject.getString("fullname"));
-            user.setTaskId(jsonObject.getString("taskId"));
-            user.setSystemId(jsonObject.getString("systemId"));
-            user.setLoginName(jsonObject.getString("username"));
-            user.setEffectOn(jsonObject.getString("effectOn"));
-            user.setIsDisabled(jsonObject.getString("isDisabled"));
-            user.setIsDeleted(jsonObject.getString("isDeleted"));
-            user.setCreateAt(jsonObject.getString("createAt"));
-            user.setUpdateAt(jsonObject.getString("updateAt"));
-            user.setGuid(jsonObject.getString("guid"));
-            //手机号加密
-            String mobileNumber =
-                    IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, jsonObject.getString("mobileNumber"));
-            user.setMobileNumber(mobileNumber);
-
-            user.setPhonenumber(mobileNumber);
-            user.setEmail(jsonObject.getString("email"));
-            user.setCertificateTypeId(jsonObject.getString("certificateTypeId"));
-            user.setCertificateTypeIdCode(jsonObject.getString("certificateTypeIdCode"));
-            //证件号加密
-            String certificateNumber =
-                    IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, jsonObject.getString("certificateNumber"));
-            user.setCertificateNumber(certificateNumber);
-            user.setIsMappingPerson(jsonObject.getString("isMappingPerson"));
-            //证件号加密
-            String units =
-                    IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, jsonObject.getString("units"));
-            user.setUnits(units);
-
-            user.randomSalt();
-            //新增用户默认不删除标记
-            user.setDelFlag("0");
-
-            User uniqueUser = userMapper.selectUserByLoginName(jsonObject.getString("username"));
-            if (null != uniqueUser && uniqueUser.getUserId() != null) {
-                // 跟新数据库
-                user.setUserId(uniqueUser.getUserId());
-                int rowNum = userMapper.updateUser(user);
-                updateNum += rowNum;
-            } else {
-                // 插入数据库
-                int rowNum = userMapper.insertUser(user);
-                insertNum += rowNum;
+                User user = new User();
+                user.setDeptId(jsonObject.getString("organizationId"));
+                user.setOrganizationId(jsonObject.getString("organizationId"));
+                user.setStrUserId(jsonObject.getString("userId"));
+                user.setSrzUserid(jsonObject.getString("srzUserId"));
+                user.setFullname(jsonObject.getString("fullname"));
+                user.setUserName(jsonObject.getString("fullname"));
+                user.setTaskId(jsonObject.getString("taskId"));
+                user.setSystemId(jsonObject.getString("systemId"));
+                user.setLoginName(jsonObject.getString("username"));
+                user.setEffectOn(jsonObject.getString("effectOn"));
+                user.setIsDisabled(jsonObject.getString("isDisabled"));
+                user.setIsDeleted(jsonObject.getString("isDeleted"));
+                user.setCreateAt(jsonObject.getString("createAt"));
+                user.setUpdateAt(jsonObject.getString("updateAt"));
+                user.setGuid(jsonObject.getString("guid"));
+                //手机号加密
+                String mobileNumber = "";
+                try {
+                    mobileNumber = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, jsonObject.getString("mobileNumber"));
+                } catch (Exception e) {
+                    mobileNumber = "";
+                }
+                user.setMobileNumber(mobileNumber);
+
+                user.setPhonenumber(mobileNumber);
+                user.setEmail(jsonObject.getString("email"));
+                user.setCertificateTypeId(jsonObject.getString("certificateTypeId"));
+                user.setCertificateTypeIdCode(jsonObject.getString("certificateTypeIdCode"));
+                //证件号加密
+                String certificateNumber = "";
+                try {
+                    certificateNumber = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, jsonObject.getString("certificateNumber"));
+                } catch (Exception e) {
+                    certificateNumber = "";
+                }
+                user.setCertificateNumber(certificateNumber);
+                user.setIsMappingPerson(jsonObject.getString("isMappingPerson"));
+                //证件号加密
+                String units = "";
+                try {
+                    units = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, jsonObject.getString("units"));
+                } catch (Exception e) {
+                    units = "";
+                }
+                user.setUnits(units);
+
+                user.randomSalt();
+                //新增用户默认不删除标记
+                user.setDelFlag("0");
+
+                User uniqueUser = userMapper.selectUserByLoginName(jsonObject.getString("username"));
+                if (null != uniqueUser && uniqueUser.getUserId() != null) {
+                    // 跟新数据库
+                    user.setUserId(uniqueUser.getUserId());
+                    int rowNum = userMapper.updateUser(user);
+                    updateNum += rowNum;
+                } else {
+                    // 插入数据库
+                    int rowNum = userMapper.insertUser(user);
+                    insertNum += rowNum;
+                }
+            } catch (Exception e) {
+                continue;
             }
         }
         Map<String, Integer> resMap = new HashedMap();

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/add.html

@@ -9,7 +9,7 @@
 	<form class="form-horizontal m" id="form-dept-edit">
 		<input id="treeId" name="parentId" type="hidden" th:value="${linkage.id}"   />
 		<div class="form-group">
-			<label class="col-sm-3 control-label">上级部门：</label>
+			<label class="col-sm-3 control-label">上级节点：</label>
 			<div class="col-sm-8">
 				<div class="input-group">
 					<input class="form-control" type="text" id="treeName" onclick="selectItemTree()" readonly="true">
@@ -70,7 +70,7 @@
 		},
 		messages: {
 			"deptName": {
-				remote: "部门已经存在"
+				remote: "节点已经存在"
 			}
 		},
 		focusCleanup: true
@@ -82,7 +82,7 @@
 		}
 	}
 
-	/*部门管理-修改-选择部门树*/
+	/*节点管理-修改-选择节点树*/
 	function selectItemTree() {
 		var id = $("#treeId").val();
 		var options = {

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/edit.html

@@ -10,7 +10,7 @@
 			<input name="id" type="hidden" th:field="*{id}" />
 			<input id="treeId" name="parentId" type="hidden" th:field="*{parentId}" />
 			<div class="form-group">
-				<label class="col-sm-3 control-label">上级部门：</label>
+				<label class="col-sm-3 control-label">上级节点：</label>
 				<div class="col-sm-8">
 				    <div class="input-group">
 						<input class="form-control" type="text" id="treeName" onclick="selectItemTree()" readonly="true" th:field="*{parentName}">
@@ -35,7 +35,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">部门状态：</label>
+				<label class="col-sm-3 control-label">节点状态：</label>
 				<div class="col-sm-8">
 					<div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
 						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}">
@@ -80,7 +80,7 @@
 			},
 			messages: {
 		        "deptName": {
-		            remote: "部门已经存在"
+		            remote: "节点已经存在"
 		        }
 		    },
 		    focusCleanup: true
@@ -92,7 +92,7 @@
 	        }
 	    }
 	
-		/*部门管理-修改-选择部门树*/
+		/*节点管理-修改-选择节点树*/
 		function selectItemTree() {
 			var id = $("#treeId").val();
 			if(id > 0 || id.length > 1) {

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/userCheckOpt.html

@@ -15,7 +15,7 @@
 			<div class="box-tools pull-right">
 				<button type="button" class="btn btn-box-tool" id="btnExpand" title="展开" style="display:none;"><i class="fa fa-chevron-up"></i></button>
 				<button type="button" class="btn btn-box-tool" id="btnCollapse" title="折叠"><i class="fa fa-chevron-down"></i></button>
-				<button type="button" class="btn btn-box-tool" id="btnRefresh" title="刷新部门"><i class="fa fa-refresh"></i></button>
+				<button type="button" class="btn btn-box-tool" id="btnRefresh" title="刷新节点"><i class="fa fa-refresh"></i></button>
 			</div>
 		</div>
 		<div class="ui-layout-content">

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/view.html

@@ -11,7 +11,7 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            名称：<input type="text" name="deptName" placeholder="请输入部门名称"/>
+                            名称：<input type="text" name="deptName" placeholder="请输入节点名称"/>
                         </li>
                         <li>
                             状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
@@ -62,7 +62,7 @@
             updateUrl: prefix + "/edit/{id}",
             removeUrl: prefix + "/remove/{id}",
             bordered: true,
-            modalName: "部门",
+            modalName: "节点",
             height:$(window).height()-$(".search-collapse").height()-$("#toolbar").height()-65,
             columns: [{
                 field: 'selectItem',

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalMapper.java

@@ -27,6 +27,7 @@ public interface StatisticalMapper {
      * @return
      */
     List<StatisticalVo> statisticalLawEnforcer(StatisticalVo statisticalVo);
+    List<StatisticalVo> statisticalLawEnforcer2(StatisticalVo statisticalVo);
 
     /**
      * 统计企业类型

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LinkageDictServiceImpl.java

@@ -46,7 +46,6 @@ public class LinkageDictServiceImpl implements ILinkageDictService
         return linkageDictMapper.selectLinkageDictById(id);
     }
     @Override
-    @DataScope
     public LinkageDict selectLinkageDictByValueAndParentId(String value, String parentId)
     {
         return linkageDictMapper.selectLinkageDictByValueAndParentId(value, parentId);
@@ -59,7 +58,6 @@ public class LinkageDictServiceImpl implements ILinkageDictService
      * @return 联动字典
      */
     @Override
-    @DataScope
     public List<LinkageDict> selectLinkageDictList(LinkageDict linkageDict)
     {
         return linkageDictMapper.selectLinkageDictList(linkageDict);
@@ -155,7 +153,6 @@ public class LinkageDictServiceImpl implements ILinkageDictService
      * @return 所有节点信息
      */
     @Override
-    @DataScope(deptAlias = "d")
     public List<Ztree> selectItemTree(LinkageDict dict)
     {
         List<LinkageDict> dictList = linkageDictMapper.selectLinkageDictList(dict);

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java

@@ -46,6 +46,7 @@ public class StatisticalServiceImpl implements StatisticalService
         List<StatisticalVo> statisticalVos1 = statisticalMapper.statisticalEnterpriseType(statisticalVo);
         //执法人员统计
         List<StatisticalVo> statisticalVos2 = statisticalMapper.statisticalLawEnforcer(statisticalVo);
+//        List<StatisticalVo> statisticalVos2 = statisticalMapper.statisticalLawEnforcer2(statisticalVo);
         //本月案件总数统计
         StatisticalVo statisticalVos3 = statisticalMapper.statisticalToMouth(statisticalVo);
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml

@@ -68,6 +68,14 @@
             GROUP BY
                 law_enforcer_id_two) t  GROUP BY t.law_enforcer_id  order by t.total desc
     </select>
+    <select id="statisticalLawEnforcer2" parameterType="StatisticalVo" resultMap="StatisticalVoResult">
+        SELECT er.law_enforcer, er.law_enforcer_id, count(1) AS total
+        FROM enforcement_registration er
+        WHERE DATE_FORMAT( er.enforcement_time, '%Y%m' ) = DATE_FORMAT( CURDATE(), '%Y%m' )
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        GROUP BY er.law_enforcer_id  order by total desc
+    </select>
     <select id="statisticalEnterpriseType" parameterType="StatisticalVo" resultMap="StatisticalVoResult">
         SELECT
             sdd.dict_label,