From a03f0cc86331138995ade0bd7cdb8ea4afcf6ba5 Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Tue, 17 Jun 2025 17:13:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E4=B8=8A=E7=BA=BF=E4=BB=A5?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E6=89=80=E6=9C=89=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 14 +- .../AppEnterpriseComplaintController.java | 24 ++- ...AppEnterpriseLawEnforcementController.java | 28 ++- .../controller/AppThirdLoginController.java | 12 +- .../java/com/zdxt/app/task/SynDeptTask.java | 1 + .../com/zdxt/app/task/SynUserInfoTask.java | 1 + .../zdxt/app/task/SynUserLawNoByCodeTask.java | 178 +++++++++--------- .../zdxt/app/task/UserInfoAndDeptTask.java | 1 + .../system/user/mapper/UserMapper.java | 1 + .../system/user/service/IUserService.java | 1 + .../system/user/service/UserServiceImpl.java | 4 + .../resources/mapper/system/UserMapper.xml | 6 + .../templates/system/notice/add.html | 15 +- .../templates/system/notice/edit.html | 13 +- .../mapper/EnforcementRegistrationMapper.java | 1 + .../mapper/EnterpriseComplaintMapper.java | 3 + .../code/mapper/Xzjcjbxx025711Mapper.java | 1 + .../IEnforcementRegistrationService.java | 1 + .../service/IEnterpriseComplaintService.java | 2 + .../zdxt/code/service/ThirdLoginService.java | 2 + .../EnforcementRegistrationServiceImpl.java | 7 + .../impl/EnterpriseComplaintServiceImpl.java | 5 + .../service/impl/ThirdLoginServiceImpl.java | 52 ++++- .../mapper/EnforcementRegistrationMapper.xml | 88 +++++++++ .../mapper/EnterpriseComplaintMapper.xml | 35 +++- .../resources/mapper/Xzjcjbxx025711Mapper.xml | 4 + 26 files changed, 357 insertions(+), 143 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java index 43078670..2e3c1c62 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java @@ -128,11 +128,12 @@ public class AppEnforcementRegistrationController extends BaseController * 查询执法端-执法登记列表 */ // @RequiresPermissions("code:registration:list") - @GetMapping("/queryList") + @PostMapping("/queryList") @ResponseBody - public TableDataInfo queryList(EnforcementRegistration enforcementRegistration) + public TableDataInfo queryList(@RequestBody EnforcementRegistration enforcementRegistration) { - startPage(); +// startPage(); + int totalNum = enforcementRegistrationService.countEnforcementRegistrationList(enforcementRegistration); List list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); DictDataBean dictParams = new DictDataBean(); dictParams.setDictType("check_category"); @@ -186,7 +187,12 @@ public class AppEnforcementRegistrationController extends BaseController long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now()); ee.setOutTimeDayNum(daysBetween); } - return getDataTable(list); + + TableDataInfo rspData = getDataTable(list); + rspData.setCode(0); + rspData.setRows(list); + rspData.setTotal(totalNum); + return rspData; } diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java index 18cf3c79..7460f354 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java @@ -78,15 +78,16 @@ public class AppEnterpriseComplaintController extends BaseController { /** * 查询企业执法-在线投诉列表 */ - @GetMapping("/queryList") + @PostMapping("/queryList") @ResponseBody - public TableDataInfo queryList(EnterpriseComplaint enterpriseComplaint) { - List list = enterpriseComplaintService.selectEnterpriseComplaintList(enterpriseComplaint); + public TableDataInfo queryList(@RequestBody EnterpriseComplaint enterpriseComplaint) { + int total = enterpriseComplaintService.selectTotal(enterpriseComplaint); + List pageList = enterpriseComplaintService.selectEnterpriseComplaintList(enterpriseComplaint); //手动分页 - List pageList = list.stream() - .skip(ServletUtils.getParameterToInt(Constants.PAGE_NUM)) - .limit(ServletUtils.getParameterToInt(Constants.PAGE_SIZE)) - .collect(Collectors.toList()); +// List pageList = list.stream() +// .skip(ServletUtils.getParameterToInt(Constants.PAGE_NUM)) +// .limit(ServletUtils.getParameterToInt(Constants.PAGE_SIZE)) +// .collect(Collectors.toList()); pageList.forEach(res ->{ if(StringUtils.isNotEmpty(res.getComplaintDepartments())){ String[] strings = Convert.toStrArray(res.getComplaintDepartments()); @@ -100,12 +101,15 @@ public class AppEnterpriseComplaintController extends BaseController { //判断检查事件是否为空 if(BeanUtil.isNotEmpty(enforcementRegistration) && StringUtils.isNotEmpty(enforcementRegistration.getLawEnforcementItemText())){ pageList.get(i).setLawEnforcementIncident(enforcementRegistration.getLawEnforcementItemText()); + pageList.get(i).setBureauDeptName(enforcementRegistration.getBureauDeptName()); } } } - TableDataInfo dataTable = getDataTable(list); - dataTable.setRows(pageList); - return dataTable; + TableDataInfo rspData = getDataTable(pageList); + rspData.setCode(0); + rspData.setRows(pageList); + rspData.setTotal(total); + return rspData; } /** diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java index 3d0edcac..6cfa192b 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java @@ -375,24 +375,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController db.setDeptName(ment.getLawEnforcement()); objs.add(db); } - } else { -// JSONObject jsonObject = JSON.parseObject(enfrorcement.getTmpDeptJson()); -// Set keys = jsonObject.keySet(); -// for (String key : keys) { -// DeptBean db = new DeptBean(); -// db.setDeptId(key); -// db.setDeptName(jsonObject.getString(key)); -// objs.add(db); -// } } - - //TODO 执法事项修改为手动输入 -// Map params = new HashMap<>(); -// LinkageDict tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckItem()); -// params.put("checkItemText", null==tmp?enfrorcement.getCheckItemText():tmp.getTitle()); -// tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckRequire()); -// params.put("checkRequireText", null==tmp?enfrorcement.getCheckRequireText():tmp.getTitle()); -// enfrorcement.setParams(params); enfrorcement.setDeptObjs(objs); userObjs = JSONObject.parseArray(enfrorcement.getTmpDeptJson(), UserBean.class); enfrorcement.setUserObjs(userObjs); @@ -424,6 +407,17 @@ public class AppEnterpriseLawEnforcementController extends BaseController } enfrorcement.setLawEnforcer2Show(tmpUserShow); +// /** 忘记业务到底变啥样了, 就只到要正常展示出 执法人员的列表 */ +// // 根据 getLawEnforcerTwo 逗号成列表, 然后塞到 setUserObjs +// List tmpUsers = new ArrayList<>(); +// String[] split = enfrorcement.getLawEnforcerTwoId().split(","); +// for (int i = 0; i < split.length; i++) { +// UserBean ub = userApi.getUserByUserId(Long.valueOf(split[i])); +// tmpUsers.add(ub); +// } +// enfrorcement.setUserObjs(tmpUsers); +// /** 忘记业务到底变啥样了, 就只到要正常展示出 执法人员的列表 */ + // 判断是否超时 LocalDate checkTime = LocalDate.parse(enfrorcement.getCheckTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); long daysBetween = ChronoUnit.DAYS.between(LocalDate.now(), checkTime); diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java index 799886de..6179aec7 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java @@ -38,6 +38,7 @@ import org.springframework.web.bind.annotation.*; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.HashMap; +import java.util.List; import java.util.Map; import static com.zdxt.code.utils.ServiceInvocation.gatewaySignEncode; @@ -139,6 +140,7 @@ public class AppThirdLoginController { String accessTokenJson = ""; String userJson = ""; + User user = null; try { // 获取 access_token accessTokenJson = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/gettoken?corpid="+szyptCorpid+"&corpsecret="+szyptCorpsecret, null); @@ -152,12 +154,18 @@ public class AppThirdLoginController { String userId = userOjb.getString("UserId"); // UserBean userBean = userApi.getUserByUserStrId(userId); - User user = iUserService.selectUserByLoginName(userId); +// user = iUserService.selectUserByLoginName(userId); + List us = iUserService.selectUserByLoginNameD(userId); + user = null!=us && us.size()>0 ? us.get(0) : null; // todo:这里需要将转换出来的User存redis用于做权限 redisCache.setCacheObject("shiro:app:"+user.getUserId(), user); - return thirdLoginService.szyLogin(user.getLoginName()); +// return thirdLoginService.szyLogin(user.getLoginName()); + return thirdLoginService.szyLogin2(user); } catch (Exception e) { + log.error("---> 市认证用户信息: {}", userJson); + log.error("---> 本系统用户信息: {}", user); + log.error(e.getMessage()); e.printStackTrace(); } diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptTask.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptTask.java index 21a8f66c..6537465c 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptTask.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptTask.java @@ -105,6 +105,7 @@ public class SynDeptTask { JSONArray dataArr = tmpJsonObj.getJSONArray("data"); if (null == dataArr || dataArr.size()==0) { break; } // 插入更新数据库 + log.error("-------------------> 原始组织json: {}", dataArr); Map resMap = deptService.addSrzDept(dataArr,token); sumMap.add(resMap); page++; diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserInfoTask.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserInfoTask.java index d1282804..853a1254 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserInfoTask.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserInfoTask.java @@ -98,6 +98,7 @@ public class SynUserInfoTask { break; } JSONArray dataArr = tmpJsonObj.getJSONArray("data"); + log.info("市认证过来的用户信息---> : {}", tmpJsonObj); if (null == dataArr || dataArr.size()==0) { break; } Map resMap = userService.addSrzUser(dataArr, token); sumMap.add(resMap); diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserLawNoByCodeTask.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserLawNoByCodeTask.java index 6de889e2..34e20d43 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserLawNoByCodeTask.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserLawNoByCodeTask.java @@ -1,89 +1,89 @@ -package com.zdxt.app.task; - -import com.zdxt.auth.project.system.user.service.IUserService; -import com.zdxt.code.domain.Zfryjdm2405301; -import com.zdxt.code.service.IZfryjdm2405301Service; -import com.zdxt.common.util.IdCardCryptoUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import java.util.List; - - -/** - * @Author: kylin - * @Date: 2024/5/9 2:58 下午 - * @Version: 1.0 - * @Desc: TODO - */ -@Component("synUserLawNoByCodeTask") -public class SynUserLawNoByCodeTask { - - private static final Logger log = LoggerFactory.getLogger(SynUserLawNoByCodeTask.class); - - @Value("${srnwg.secretKey}") - private String secretKey; - - @Autowired private IZfryjdm2405301Service iZfryjdm2405301Service; - @Autowired private IUserService userService; - - - - public void run(){ - this.encryptSfzcode2(); - } - - /** - * 同步用户执法编码 - */ - public void encryptSfzcode(){ - int optionNum = 0; - int optionUserNum = 0; - try { - List zqyjjdmList = iZfryjdm2405301Service.selectZfryjdmList(null); - for (Zfryjdm2405301 zq : zqyjjdmList) { - //证件号加密 - String sfzcode = ""; - try { - sfzcode = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, zq.getSfzcode()); - } catch (Exception e) { - sfzcode = ""; - } - zq.setSfzcodeEncrypt(sfzcode); - optionNum += iZfryjdm2405301Service.updateZfryjdmSfzcodeByid(zq); - optionUserNum += userService.updateLawCertificateNum(sfzcode); - } - log.info("加密身份证数量 : {}", optionNum); - log.info("更新用户执法码数量 : {}", optionUserNum); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public void encryptSfzcode2(){ - int optionNum = 0; - int optionUserNum = 0; - try { - List zqyjjdmList = iZfryjdm2405301Service.selectZfryjdmList(null); - for (Zfryjdm2405301 zq : zqyjjdmList) { - //证件号加密 - String sfzcode = ""; - try { - sfzcode = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, zq.getSfzcode()); - } catch (Exception e) { - sfzcode = "1991"; - } - zq.setSfzcodeEncrypt(sfzcode); - optionNum += iZfryjdm2405301Service.updateZfryjdmSfzcodeByid(zq); - optionUserNum += userService.updateLawCertificateNumByCertificateNumber(zq.getZfcode(), sfzcode); - } - log.info("加密身份证数量 : {}", optionNum); - log.info("更新用户执法码数量 : {}", optionUserNum); - } catch (Exception e) { - e.printStackTrace(); - } - } -} +package com.zdxt.app.task; + +import com.zdxt.auth.project.system.user.service.IUserService; +import com.zdxt.code.domain.Zfryjdm2405301; +import com.zdxt.code.service.IZfryjdm2405301Service; +import com.zdxt.common.util.IdCardCryptoUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import java.util.List; + + +/** + * @Author: kylin + * @Date: 2024/5/9 2:58 下午 + * @Version: 1.0 + * @Desc: TODO + */ +@Component("synUserLawNoByCodeTask") +public class SynUserLawNoByCodeTask { + + private static final Logger log = LoggerFactory.getLogger(SynUserLawNoByCodeTask.class); + + @Value("${srnwg.secretKey}") + private String secretKey; + + @Autowired private IZfryjdm2405301Service iZfryjdm2405301Service; + @Autowired private IUserService userService; + + + + public void run(){ + this.encryptSfzcode2(); + } + + /** + * 同步用户执法编码 + */ + public void encryptSfzcode(){ + int optionNum = 0; + int optionUserNum = 0; + try { + List zqyjjdmList = iZfryjdm2405301Service.selectZfryjdmList(null); + for (Zfryjdm2405301 zq : zqyjjdmList) { + //证件号加密 + String sfzcode = ""; + try { + sfzcode = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, zq.getSfzcode()); + } catch (Exception e) { + sfzcode = ""; + } + zq.setSfzcodeEncrypt(sfzcode); + optionNum += iZfryjdm2405301Service.updateZfryjdmSfzcodeByid(zq); + optionUserNum += userService.updateLawCertificateNum(sfzcode); + } + log.info("加密身份证数量 : {}", optionNum); + log.info("更新用户执法码数量 : {}", optionUserNum); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public void encryptSfzcode2(){ + int optionNum = 0; + int optionUserNum = 0; + try { + List zqyjjdmList = iZfryjdm2405301Service.selectZfryjdmList(null); + for (Zfryjdm2405301 zq : zqyjjdmList) { + //证件号加密 + String sfzcode = ""; + try { + sfzcode = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, zq.getSfzcode()); + } catch (Exception e) { + sfzcode = "1991"; + } + zq.setSfzcodeEncrypt(sfzcode); + optionNum += iZfryjdm2405301Service.updateZfryjdmSfzcodeByid(zq); + optionUserNum += userService.updateLawCertificateNumByCertificateNumber(zq.getZfcode(), sfzcode); + } + log.info("加密身份证数量 : {}", optionNum); + log.info("更新用户执法码数量 : {}", optionUserNum); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java index 88aecfc9..f9d504bf 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java @@ -103,6 +103,7 @@ public class UserInfoAndDeptTask { break; } JSONArray dataArr = tmpJsonObj.getJSONArray("data"); + log.info("市认证过来的用户信息: {}", dataArr); if (null == dataArr || dataArr.size()==0) { break; } Map resMap = userService.addSrzUser(dataArr, token); sumMap.add(resMap); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java index 1be412e9..8746e3ee 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java @@ -71,6 +71,7 @@ public interface UserMapper * @return 用户对象信息 */ User selectUserByLoginName(String userName); + List selectUserByLoginNameD(String userName); User selectUserByCertificateNumber(String certificateNumber); User selectUserByUserPhone(String phone); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java index 340a52c4..7f0c04d1 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java @@ -82,6 +82,7 @@ public interface IUserService * @return 用户对象信息 */ User selectUserByLoginName(String userName); + List selectUserByLoginNameD(String userName); /** * 支持多端登录 diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java index 0692b16b..900f7be3 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java @@ -182,6 +182,10 @@ public class UserServiceImpl implements IUserService { public User selectUserByLoginName(String userName) { return userMapper.selectUserByLoginName(userName); } + @Override + public List selectUserByLoginNameD(String userName) { + return userMapper.selectUserByLoginNameD(userName); + } @Override public User selectClientUserByLoginName(String userName, Integer userSource) { diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml index 75edab8d..b062bc2d 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml @@ -329,6 +329,12 @@ and u.del_flag = 0 + + -
+
@@ -154,12 +154,13 @@ data[item[0]] = item[1]; } } - //特殊处理noticeContent - var str = formData.match(/noticeContent=(\S*)&status/)[1]; - if (str.length>0) { - var value = str.replaceAll("+", " "); - data["noticeContent"] = value; - } + // //特殊处理noticeContent + // var str = formData.match(/noticeContent=(\S*)&status/)[1]; + // if (str.length>0) { + // var value = str.replaceAll("+", " "); + // data["noticeContent"] = value; + // } + data.content = $('#itemContentSummernote').summernote('code'); return data; }, layoutTemplates: { diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/edit.html index fe738229..f6fb1164 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/edit.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/edit.html @@ -174,12 +174,13 @@ data[item[0]] = item[1]; } } - //特殊处理noticeContent - var str = formData.match(/noticeContent=(\S*)&status/)[1]; - if (str.length>0) { - var value = str.replaceAll("+", " "); - data["noticeContent"] = value; - } + // //特殊处理noticeContent + // var str = formData.match(/noticeContent=(\S*)&status/)[1]; + // if (str.length>0) { + // var value = str.replaceAll("+", " "); + // data["noticeContent"] = value; + // } + data.content = $('#editor').summernote('code'); return data; }, layoutTemplates: { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java index 5d87996e..5e1952a9 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java @@ -33,6 +33,7 @@ public interface EnforcementRegistrationMapper * @return 执法端-执法登记集合 */ List selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration); + int countEnforcementRegistrationList(EnforcementRegistration enforcementRegistration); List selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java index 92a5c34f..4f3d43bf 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java @@ -1,6 +1,8 @@ package com.zdxt.code.mapper; import com.zdxt.code.domain.EnterpriseComplaint; +import com.zdxt.code.domain.EnterpriseLawEnforcement; + import java.util.List; /** @@ -35,6 +37,7 @@ public interface EnterpriseComplaintMapper * @return */ List selectEnterpriseComplaintNew(EnterpriseComplaint enterpriseComplaint); + int selectTotal(EnterpriseComplaint enterpriseComplaint); /** * 查询工单数据 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Xzjcjbxx025711Mapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Xzjcjbxx025711Mapper.java index b3d61cf2..dedc24e3 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Xzjcjbxx025711Mapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Xzjcjbxx025711Mapper.java @@ -80,5 +80,6 @@ public interface Xzjcjbxx025711Mapper * @return */ public List queryZFRYByIdCard(String userIdCard); + public List queryZFRYByzfcode(String zfcode); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java index c7e2b76f..3dbf8129 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java @@ -35,6 +35,7 @@ public interface IEnforcementRegistrationService * @return 执法端-执法登记集合 */ List selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration); + int countEnforcementRegistrationList(EnforcementRegistration enforcementRegistration); List selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java index be748a0f..1ede773b 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java @@ -1,6 +1,7 @@ package com.zdxt.code.service; import com.zdxt.code.domain.EnterpriseComplaint; +import com.zdxt.code.domain.EnterpriseLawEnforcement; import com.zdxt.code.domain.MssqOrderFlow; import com.zdxt.common.annotation.DataScope; @@ -38,6 +39,7 @@ public interface IEnterpriseComplaintService * @return 企业执法-在线投诉集合 */ List selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint); + public int selectTotal(EnterpriseComplaint enterpriseComplaint); /** * 新增企业执法-在线投诉 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ThirdLoginService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ThirdLoginService.java index a79ae572..b934deb4 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ThirdLoginService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ThirdLoginService.java @@ -2,6 +2,7 @@ package com.zdxt.code.service; import com.alibaba.fastjson.JSONObject; import com.zdxt.common.ZDResponse; +import com.zdxt.domain.auth.User; /** * 第三方登录业务层 @@ -13,6 +14,7 @@ public interface ThirdLoginService { */ ZDResponse siqLogin(JSONObject jsonObject); ZDResponse szyLogin(String loginUser); + ZDResponse szyLogin2(User user); /** * 添加深i企用户 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index 63cd1522..0fbafced 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -198,6 +198,13 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat return enforcementRegistrations; } + @Override + @DataScope + public int countEnforcementRegistrationList(EnforcementRegistration enforcementRegistration) + { + return enforcementRegistrationMapper.countEnforcementRegistrationList(enforcementRegistration); + } + @Override // @DataScope public List selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java index b41a14ee..0882ae80 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java @@ -144,6 +144,11 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi return enterpriseComplaints; } + @Override + public int selectTotal(EnterpriseComplaint enterpriseComplaint) { + return enterpriseComplaintMapper.selectTotal(enterpriseComplaint); + } + /** * 新增企业执法-在线投诉 * diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java index 3683a6d9..a089371f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java @@ -21,6 +21,7 @@ import com.zdxt.common.ZDResponse; import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.StringUtils; import com.zdxt.common.util.UserConstants; +import com.zdxt.domain.auth.User; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -33,6 +34,7 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -143,6 +145,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { // 判断是否执法人员 if(StrUtil.isNotEmpty(user.getCertificateNumber())){ user.setLawOfficer(this.checkIsLawOfficer(user.getCertificateNumber())); + log.info("-----------> 判断是否执法人员: {}", user.getLawOfficer()); }else{ user.setLawOfficer(false); } @@ -153,6 +156,49 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { user.setToken(token1); return ZDResponse.success("登录成功",user); } catch (Exception e) { + log.error(e.getMessage()); + e.printStackTrace(); + } + return null; + } + + @Override + public ZDResponse szyLogin2(User user_source) { + Integer userSource = 0; + try { + //查询登录用户 + UserBean user = new UserBean(); + BeanUtils.copyProperties(user_source,user); + //本系统令牌 +// UsernamePasswordToken sysToken = new UsernamePasswordToken(user.getLoginName(), user.getPassword(), false); + UserToken sysToken = new UserToken(user.getLoginName(), LoginType.NOPASSWD,userSource); + Subject subject = SecurityUtils.getSubject(); + subject.login(sysToken); + DeptBean dept = deptApi.getDeptById(user.getOrganizationId()); + user.setDept(dept); + user.setDeptId(user.getOrganizationId()); + // 判断是否执法人员 + if(StrUtil.isNotEmpty(user.getCertificateNumber())){ + user.setLawOfficer(this.checkIsLawOfficer(user.getCertificateNumber())); + log.info("-----------> 判断是否执法人员: {}", user.getLawOfficer()); + }else if (StrUtil.isNotEmpty(user.getCertificateNumber())){ // 没有身份证的话就用执法证去找下 + List zfryjdm2405301s = xzjcjbxx025711Mapper.queryZFRYByzfcode(user.getLawCertificateNum()); + if (zfryjdm2405301s.size() > 0) { + user.setLawOfficer(true); + } else { + user.setLawOfficer(false); + } + } else { + user.setLawOfficer(false); + } + Map payload = new HashMap<>(); + payload.put("id", user.getUserId()); + payload.put("name", user.getLoginName()); + String token1 = JWTUtils.sign(payload); + user.setToken(token1); + return ZDResponse.success("登录成功",user); + } catch (Exception e) { + log.error(e.getMessage()); e.printStackTrace(); } return null; @@ -320,6 +366,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { public Boolean checkIsLawOfficer(String userIdCard) { //证件号解密 String s = IdCardCryptoUtil.symmetricDecryptIdCard(srzSecretKey, userIdCard); + log.error("----> 打印出身份证解密用盐: {}", srzSecretKey); System.out.println("======身份证解密========"); log.info(s); System.out.println("=============="); @@ -365,8 +412,3 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { - - - - - diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index d21f3982..2c82785f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -156,6 +156,94 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by enforcement_time desc + + LIMIT #{params.pageNum}, #{params.pageSize} + + + + + + select `name`,zfzzfdw,sfzcode,zfcode from ZFRYJDM2405301 where SFZCODE = #{userIdCard} + + \ No newline at end of file