Browse Source

正式上线以来的所有修改

v6
蟑螂恶霸 1 year ago
parent
commit
a03f0cc863
  1. 14
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
  2. 24
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java
  3. 28
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java
  4. 12
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java
  5. 1
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptTask.java
  6. 1
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserInfoTask.java
  7. 178
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserLawNoByCodeTask.java
  8. 1
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java
  9. 1
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java
  10. 1
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java
  11. 4
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java
  12. 6
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
  13. 15
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/add.html
  14. 13
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/edit.html
  15. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java
  16. 3
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java
  17. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Xzjcjbxx025711Mapper.java
  18. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
  19. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java
  20. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ThirdLoginService.java
  21. 7
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
  22. 5
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
  23. 52
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java
  24. 88
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
  25. 35
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml
  26. 4
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Xzjcjbxx025711Mapper.xml

14
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<EnforcementRegistration> 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;
}

24
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<EnterpriseComplaint> list = enterpriseComplaintService.selectEnterpriseComplaintList(enterpriseComplaint);
public TableDataInfo queryList(@RequestBody EnterpriseComplaint enterpriseComplaint) {
int total = enterpriseComplaintService.selectTotal(enterpriseComplaint);
List<EnterpriseComplaint> pageList = enterpriseComplaintService.selectEnterpriseComplaintList(enterpriseComplaint);
//手动分页
List<EnterpriseComplaint> pageList = list.stream()
.skip(ServletUtils.getParameterToInt(Constants.PAGE_NUM))
.limit(ServletUtils.getParameterToInt(Constants.PAGE_SIZE))
.collect(Collectors.toList());
// List<EnterpriseComplaint> 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;
}
/**

28
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<String> keys = jsonObject.keySet();
// for (String key : keys) {
// DeptBean db = new DeptBean();
// db.setDeptId(key);
// db.setDeptName(jsonObject.getString(key));
// objs.add(db);
// }
}
//TODO 执法事项修改为手动输入
// Map<String, Object> 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<UserBean> 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);

12
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<User> 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();
}

1
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<String, Integer> resMap = deptService.addSrzDept(dataArr,token);
sumMap.add(resMap);
page++;

1
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<String, Integer> resMap = userService.addSrzUser(dataArr, token);
sumMap.add(resMap);

178
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<Zfryjdm2405301> 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<Zfryjdm2405301> 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<Zfryjdm2405301> 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<Zfryjdm2405301> 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();
}
}
}

1
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<String, Integer> resMap = userService.addSrzUser(dataArr, token);
sumMap.add(resMap);

1
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<User> selectUserByLoginNameD(String userName);
User selectUserByCertificateNumber(String certificateNumber);
User selectUserByUserPhone(String phone);

1
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<User> selectUserByLoginNameD(String userName);
/**
* 支持多端登录

4
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<User> selectUserByLoginNameD(String userName) {
return userMapper.selectUserByLoginNameD(userName);
}
@Override
public User selectClientUserByLoginName(String userName, Integer userSource) {

6
lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@ -329,6 +329,12 @@
and u.del_flag = 0
</select>
<select id="selectUserByLoginNameD" parameterType="String" resultMap="UserResult">
<include refid="selectUserVo"/>
where u.login_name = #{userName}
and u.del_flag = 0
</select>
<select id="selectUserByCertificateNumber" parameterType="String" resultMap="UserResult">
<include refid="selectUserVo"/>
where u.certificateNumber = #{certificateNumber}

15
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/add.html

@ -34,7 +34,7 @@
<label class="col-sm-2 control-label">通知内容:</label>
<div class="col-sm-10">
<input id="noticeContent" name="noticeContent" type="hidden">
<div class="summernote"></div>
<div id="itemContentSummernote" class="summernote"></div>
</div>
</div>
<div class="form-group">
@ -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: {

13
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: {

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

@ -33,6 +33,7 @@ public interface EnforcementRegistrationMapper
* @return 执法端-执法登记集合
*/
List<EnforcementRegistration> selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration);
int countEnforcementRegistrationList(EnforcementRegistration enforcementRegistration);
List<EnforcementRegistration> selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration);

3
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<EnterpriseComplaint> selectEnterpriseComplaintNew(EnterpriseComplaint enterpriseComplaint);
int selectTotal(EnterpriseComplaint enterpriseComplaint);
/**
* 查询工单数据

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

@ -80,5 +80,6 @@ public interface Xzjcjbxx025711Mapper
* @return
*/
public List<Zfryjdm2405301> queryZFRYByIdCard(String userIdCard);
public List<Zfryjdm2405301> queryZFRYByzfcode(String zfcode);
}

1
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java

@ -35,6 +35,7 @@ public interface IEnforcementRegistrationService
* @return 执法端-执法登记集合
*/
List<EnforcementRegistration> selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration);
int countEnforcementRegistrationList(EnforcementRegistration enforcementRegistration);
List<EnforcementRegistration> selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration);

2
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<EnterpriseComplaint> selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint);
public int selectTotal(EnterpriseComplaint enterpriseComplaint);
/**
* 新增企业执法-在线投诉

2
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企用户

7
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<EnforcementRegistration> selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration)

5
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);
}
/**
* 新增企业执法-在线投诉
*

52
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<Zfryjdm2405301> zfryjdm2405301s = xzjcjbxx025711Mapper.queryZFRYByzfcode(user.getLawCertificateNum());
if (zfryjdm2405301s.size() > 0) {
user.setLawOfficer(true);
} else {
user.setLawOfficer(false);
}
} else {
user.setLawOfficer(false);
}
Map<String,Object> 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 {

88
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@ -156,6 +156,94 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</where>
order by enforcement_time desc
<if test="params.pageNum != null and params.pageSize != null"><!-- 开始时间检索 -->
LIMIT #{params.pageNum}, #{params.pageSize}
</if>
</select>
<select id="countEnforcementRegistrationList" parameterType="EnforcementRegistration" resultType="int">
select count(1) from enforcement_registration
<where>
<if test="lawEnforcement != null and lawEnforcement != ''"> and law_enforcement like concat('%', #{lawEnforcement}, '%')</if>
<if test="bureauDeptName != null and bureauDeptName != ''"> and bureau_dept_name like concat('%', #{bureauDeptName}, '%')</if>
<if test="lawEnforcementId != null and lawEnforcementId != ''"> and law_enforcement_id = #{lawEnforcementId}</if>
<if test="enterpriseId != null and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="enterpriseNumber != null and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if>
<if test="enforcementTime != null "> and enforcement_time = #{enforcementTime}</if>
<if test="lawEnforcer != null and lawEnforcer != ''"> and law_enforcer like concat('%',#{lawEnforcer} ,'%') or law_enforcer_two like concat('%',#{lawEnforcer} ,'%')</if>
<if test="lawEnforcerId != null and lawEnforcerId != ''"> and law_enforcer_id = #{lawEnforcerId}</if>
<if test="lawEnforcerTel != null and lawEnforcerTel != ''"> and law_enforcer_tel = #{lawEnforcerTel}</if>
<if test="lawEnforcerIdTwo != null and lawEnforcerIdTwo != ''"> and law_enforcer_id_two = #{lawEnforcerIdTwo}</if>
<if test="lawEnforcerTelTwo != null and lawEnforcerTelTwo != ''"> and law_enforcer_tel_two = #{lawEnforcerTelTwo}</if>
<if test="subsidiaryer != null and subsidiaryer != ''"> and subsidiaryer = #{subsidiaryer}</if>
<if test="subsidiaryerId != null and subsidiaryerId != ''"> and subsidiaryer_id = #{subsidiaryerId}</if>
<if test="subsidiaryerTel != null and subsidiaryerTel != ''"> and subsidiaryer_tel = #{subsidiaryerTel}</if>
<if test="lawEnforcementItem != null and lawEnforcementItem != ''"> and law_enforcement_item = #{lawEnforcementItem}</if>
<if test="lawEnforcementItemText != null and lawEnforcementItemText != ''"> and law_enforcement_item_text like concat('%', #{lawEnforcementItemText,jdbcType=VARCHAR}, '%')</if>
<if test="lawEnforcementBasis != null and lawEnforcementBasis != ''"> and law_enforcement_basis = #{lawEnforcementBasis}</if>
<if test="lawEnforcementBasisText != null and lawEnforcementBasisText != ''"> and law_enforcement_basis_text = #{lawEnforcementBasisText}</if>
<if test="reslut != null "> and reslut = #{reslut}</if>
<if test="isSubmit != null "> and is_submit = #{isSubmit}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="isDelete != null "> and is_delete = #{isDelete}</if>
<if test="isComplaint != null "> and is_complaint = #{isComplaint}</if>
<if test="status != null "> and status = #{status}</if>
<if test="lawEnforcementCode != null and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
<if test="uniteCheck != null and uniteCheck != ''"> and unite_check = #{uniteCheck}</if>
<if test="checkCategory != null and checkCategory != ''"> and check_category = #{checkCategory}</if>
<if test="checkCss != null and checkCss != ''"> and check_css = #{checkCss}</if>
<if test="unionNo != null and unionNo != ''"> and union_no = #{unionNo}</if>
<if test="hasUnion != null"> and has_union = #{hasUnion}</if>
<if test="hasAuto != null"> and has_auto = #{hasAuto}</if>
<if test="searchValue != null and searchValue != ''">
and (law_enforcement_item_text like concat(concat('%',#{searchValue}),'%')
or law_enforcement like concat(concat('%',#{searchValue}),'%')
or law_enforcer like concat(concat('%',#{searchValue}),'%')
or law_enforcer_two like concat(concat('%',#{searchValue}),'%')
or enterprise_name like concat(concat('%',#{searchValue}),'%')
)
</if>
<if test="dateType != null and dateType == 1">
and DATE_FORMAT(enforcement_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
</if>
<if test="dateType != null and dateType == 2">
AND DATE_FORMAT(enforcement_time, '%Y-%m') &gt;= CONCAT(YEAR(CURDATE()), '-',
CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01'
WHEN QUARTER(CURDATE()) IN (2) THEN '04'
WHEN QUARTER(CURDATE()) IN (3) THEN '07'
ELSE '10' END)
and DATE_FORMAT(enforcement_time, '%Y-%m') &lt;= CONCAT(YEAR(CURDATE()), '-',
CASE
WHEN QUARTER(CURDATE()) IN (1) THEN '03'
WHEN QUARTER(CURDATE()) IN (2) THEN '06'
WHEN QUARTER(CURDATE()) IN (3) THEN '09'
ELSE '12'
END)
</if>
<if test="dateType != null and dateType == 3">
and DATE_FORMAT(enforcement_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
</if>
<if test="dateSearch != null and dateSearch != ''">
and DATE_FORMAT(enforcement_time, '%Y-%m') = #{dateSearch}
</if>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
and DATE_FORMAT(enforcement_time,'%Y-%m-%d') &gt;= #{beginTime}
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
and DATE_FORMAT(enforcement_time,'%Y-%m-%d') &lt;= #{endTime}
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
and enforcement_time &gt;= #{params.beginTime}
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and enforcement_time &lt;= #{params.endTime}
</if>
</where>
order by enforcement_time desc
</select>
<select id="selectEnforcementRegistrationListNew" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">

35
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml

@ -86,11 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="relId != null and relId != ''"> and c.rel_id = #{relId}</if>
<if test="enforceType != null "> and c.enforce_type = #{enforceType}</if>
<if test="problemDescription != null and problemDescription != ''">
<if test="problemDescription != null and problemDescription != ''">
and c.problem_description like concat(concat('%',#{searchValue}),'%')
</if>
<if test="linkman != null and linkman != ''"> and c.linkman = #{linkman}</if>
<if test="linkmanTel != null and linkmanTel != ''"> and c.linkman_tel = #{linkmanTel}</if>
<if test="linkman != null and linkman != ''"> and c.linkman = #{linkman}</if>
<if test="linkmanTel != null and linkmanTel != ''"> and c.linkman_tel = #{linkmanTel}</if>
<if test="enterpriseNumber != null and enterpriseNumber != ''"> and c.enterprise_number = #{enterpriseNumber}</if>
<if test="status != null"> and c.status = #{status}</if>
<if test="searchValue != null and searchValue != ''">
@ -98,8 +98,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
or r.law_enforcement_basis_text like concat(concat('%',#{searchValue}),'%')
or c.problem_description like concat(concat('%',#{searchValue}),'%'))
</if>
<if test="relId == null and enforceType == null">
and (c.enforce_type ='3' or c.rel_id is not null)
</if>
</where>
ORDER BY c.create_time DESC
<if test="params.pageNum != null and params.pageSize != null"><!-- 开始时间检索 -->
LIMIT #{params.pageNum}, #{params.pageSize}
</if>
</select>
<select id="selectTotal" parameterType="EnterpriseComplaint" resultType="int">
select count(1) from enterprise_complaint c left join enforcement_registration r on c.rel_id = r.id
<where>
<if test="relId != null and relId != ''"> and c.rel_id = #{relId}</if>
<if test="enforceType != null "> and c.enforce_type = #{enforceType}</if>
<if test="problemDescription != null and problemDescription != ''">
and c.problem_description like concat(concat('%',#{searchValue}),'%')
</if>
<if test="linkman != null and linkman != ''"> and c.linkman = #{linkman}</if>
<if test="linkmanTel != null and linkmanTel != ''"> and c.linkman_tel = #{linkmanTel}</if>
<if test="enterpriseNumber != null and enterpriseNumber != ''"> and c.enterprise_number = #{enterpriseNumber}</if>
<if test="status != null"> and c.status = #{status}</if>
<if test="searchValue != null and searchValue != ''">
and (r.law_enforcement_item_text like concat(concat('%',#{searchValue}),'%')
or r.law_enforcement_basis_text like concat(concat('%',#{searchValue}),'%')
or c.problem_description like concat(concat('%',#{searchValue}),'%'))
</if>
<if test="relId == null and enforceType == null">
and (c.enforce_type ='3' or c.rel_id is not null)
</if>
</where>
</select>
<select id="selectByStatus" parameterType="EnterpriseComplaint" resultMap="EnterpriseComplaintResult">

4
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Xzjcjbxx025711Mapper.xml

@ -332,5 +332,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="queryZFRYByIdCard" parameterType="String" resultType="com.zdxt.code.domain.Zfryjdm2405301">
select `name`,zfzzfdw,sfzcode,zfcode from ZFRYJDM2405301 where SFZCODE = #{userIdCard}
</select>
<select id="queryZFRYByzfcode" parameterType="String" resultType="com.zdxt.code.domain.Zfryjdm2405301">
select `name`,zfzzfdw,sfzcode,zfcode from ZFRYJDM2405301 where ZFCODE = #{zfcard}
</select>
</mapper>
Loading…
Cancel
Save