Browse Source

发版前提交一波同步整批修改的bug

v5
蟑螂恶霸 4 months ago
parent
commit
c029f2d6ec
  1. 2
      lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/jasypt/JasyptUtils.java
  2. 3
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java
  3. 8
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-dev.yml
  4. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-pro.yml
  5. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
  6. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
  7. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/nonRegistration/nonRegistrationView.html
  8. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
  9. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java
  10. 9
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java
  11. 57
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SrzUserServiceImpl.java
  12. 5
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml

2
lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/jasypt/JasyptUtils.java

@ -52,7 +52,7 @@ public final class JasyptUtils {
//加密
String s = encryptWithMD5("jdbc:mysql://10.76.108.1:15144/zfjd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8", "ATPfOhpnAVp6yBas7RU");
System.out.println(s);
String channelcs1 = decryptWithMD5("d4ohneeRrbUb1DsUxGfVs5K7/ZGrnDmSVMQOxx0GIcb0ZWzyCq9aC7CH4aBfwlq3T9G8BLy7cDfTO+IE4uPcstIfQmdHtOlqKxTbBAVxJOUArE3FykMxHzb/NGQ7k4ahHIt+QzH0HPagJACm5B3Wgz8oUZXwq9pZlHmmAG8994JaPIgMhIsA2Lxdnaw/LHBiGkq+FpE7j5TIcItow1HcGw==", "ATPfOhpnAVp6yBas7RU");
String channelcs1 = decryptWithMD5("Y8AuVzQ311FOgJ4h07zjkLH8ArJBED3Xxz3Ug0ncPzuLXIVCuB25DA==", "ATPfOhpnAVp6yBas7RU");
String channelcs2 = decryptWithMD5("jGDVr5PtJpE/xa9FyHzmV2PhFrtctWjETGP5lrUlOyZ68APa81+jbQYA9RNKMI/dldAm7xxTQian8370eQqlYSAyoQV9EYlhsK3MgJkn4+OmnfBNmg227+/hizsmt1swxyW2uQbdlhzw6QaXYJ175Rjtlq1yVx+NOiamEoeSO4hzHWqxKTJT/y19fHg6QTuQc3r+PEsAFQp503HsvC5lgA==", "ATPfOhpnAVp6yBas7RU");
System.out.println(channelcs1);
System.out.println(channelcs2);

3
lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java

@ -32,7 +32,8 @@ public class CorsFilter implements Filter {
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
//配置可信域名
String[] authhosts = {"http://10.132.108.3:85","http://jdm.szssfj.cn","http://localhost:85","http://192.168.31.196:3301","http://172.16.20.74:85", "http://192.168.145.155", "http://zfjdm.lggov.cn", "https://zfjdm.lggov.cn",
"http://localhost:3301","http://10.132.108.3:81","http://10.132.108.3:85", "http://192.168.1.130:3301", "http://172.16.20.74:3301", "http://10.132.108.1", "http://10.132.108.6"};
"http://localhost:3301","http://10.132.108.3:81","http://10.132.108.3:85", "http://192.168.1.130:3301", "http://172.16.20.74:3301", "http://10.132.108.1", "http://10.132.108.6",
"http://192.168.129.149","http://192.168.129.150","http://192.168.129.151","http://192.168.129.512","http://192.168.129.513","http://192.168.129.154","http://192.168.129.157","http://192.168.129.158"};
String authost = "";
HttpServletRequest httprequest = (HttpServletRequest) request;
String origin = httprequest.getHeader("Origin");

8
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-dev.yml

@ -6,9 +6,9 @@ spring:
# host: 10.76.108.1
# port: 6379
# password: zfjd@123
host: 127.0.0.1
host: 139.186.148.21
port: 6379
password:
password: zdxt@123
timeout: 6000ms # 连接超时时长(毫秒)
lettuce:
pool:
@ -47,8 +47,8 @@ yzy:
paasid: 123
#qr_code_url: C:\ruoyi\uploadPath\zfjd_logo.png
qr_code_url: /usr/local/uploads/zfjd_logo.png
qr_code_url: C:\ruoyi\uploadPath\zfjd_logo.png
#qr_code_url: /usr/local/uploads/zfjd_logo.png
#qr_code_url: /Users/kylin_stone/Workspaces/uploads/zfjd_logo.png
#深i企对接密钥 测试环境

2
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-pro.yml

@ -38,7 +38,7 @@ security:
allowed:
servernames: 10.132.108.1,10.132.108.6,10.76.108.1,10.76.108.3,10.132.108.3,10.76.108.4,10.132.108.4,jdm.szssfj.cn,58.250.157.161,127.0.0.1,localhost,192.168.31.146,192.168.236.84,192.168.168.110,192.168.11.120,61.144.224.125,10.189.1.153,61.144.224.146,192.168.6.253,61.144.224.92,61.144.224.40,61.144.224.41,61.144.224.42,61.144.224.43,192.168.129.145,192.168.129.146,192.168.129.147,192.168.129.148
servernames: 10.132.108.1,10.132.108.6,10.76.108.1,10.76.108.3,10.132.108.3,10.76.108.4,10.132.108.4,jdm.szssfj.cn,58.250.157.161,127.0.0.1,localhost,192.168.31.146,192.168.236.84,192.168.168.110,192.168.11.120,61.144.224.125,10.189.1.153,61.144.224.146,192.168.6.253,61.144.224.92,61.144.224.40,61.144.224.41,61.144.224.42,61.144.224.43,192.168.129.145,192.168.129.146,192.168.129.147,192.168.129.148,192.168.145.155,zfjdm.lggov.cn,192.168.129.149,192.168.129.150,192.168.129.151,192.168.129.512,192.168.129.513,192.168.129.154,192.168.129.157,192.168.129.158
excel:
export: true

2
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html

@ -167,7 +167,7 @@
<li>
<a class="btn btn-success btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-reset btn-sm" onclick="rest1()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
<a class="btn btn-warning btn-sm" onclick="downloadR()"><i class="fa fa-share-square-o"></i> 导出</a>
<a class="btn btn-warning btn-sm" onclick="downloadR()" shiro:hasPermission="code:registration:export1"><i class="fa fa-share-square-o"></i> 导出</a>
</li>
</ul>
<div class="static-content">

2
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html

@ -91,7 +91,7 @@
<a class="btn btn-reset btn-sm" onclick="resetR()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
<!-- <a class="btn btn-warning btn-sm" onclick="downloadR()"><i class="fa fa-share-square-o"></i> 导出</a>-->
<!-- <a class="btn btn-warning btn-sm" onclick="downloadzf1()"><i class="fa fa-share-square-o"></i> 根据自定义时间导出执法监督码使用情况</a>-->
<a class="btn btn-warning btn-sm" onclick="downloadzf1()"><i class="fa fa-share-square-o"></i> 导出</a>
<a class="btn btn-warning btn-sm" onclick="downloadzf1()" shiro:hasPermission="code:registration:export"><i class="fa fa-share-square-o"></i> 导出</a>
</li>
<!--<a class="btn btn-warning btn-sm" onclick="download2()"><i class="fa fa-share-square-o"></i> 导出企业信息</a>-->
</ul>

2
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/nonRegistration/nonRegistrationView.html

@ -90,7 +90,7 @@
<li>
<a class="btn btn-success btn-sm" onclick="searchList()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-reset btn-sm" onclick="resetList()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
<a class="btn btn-warning btn-sm" onclick="downloadExcel()"><i class="fa fa-share-square-o"></i> 导出</a>
<a class="btn btn-warning btn-sm" onclick="downloadExcel()" shiro:hasPermission="system:registration:export"><i class="fa fa-share-square-o"></i> 导出</a>
</li>
</ul>
</div>

1
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java

@ -121,6 +121,7 @@ public class EnforcementRegistrationController extends BaseController
return prefix + "/registration";
}
@RequiresPermissions("code:registration:view")
@GetMapping("/staticRegistrationView")
public String staticRegistrationView(Model model){
model.addAttribute("yearList",yearMake());

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

@ -8,6 +8,7 @@ import com.zdxt.code.domain.*;
import com.zdxt.code.mapper.*;
import com.zdxt.code.service.EnforcementCheckStatisticsService;
import com.zdxt.common.annotation.DataScope;
import com.zdxt.domain.auth.Dept;
import com.zdxt.domain.auth.DictData;
import com.zdxt.domain.auth.User;
@ -295,6 +296,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
}
@Override
@DataScope(deptAlias = "e",userAlias = "e",deptField = "bureau_dept_id")
public List<EnforcementCheckStatistics> selectAllStatisticsList(EnforcementCheckStatistics enforcementCheckStatistics) {
return enforcementCheckStatisticsMapper.selectAllStatisticsList(enforcementCheckStatistics);
}

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

@ -12,14 +12,12 @@ import com.zdxt.auth.feign.DeptApi;
import com.zdxt.auth.feign.UserApi;
import com.zdxt.auth.feign.ZdxtFileCommonApi;
import com.zdxt.auth.project.system.dict.service.IDictDataService;
import com.zdxt.code.domain.EnforcementRegistration;
import com.zdxt.code.domain.NonEnforcementRegistration;
import com.zdxt.code.mapper.NonEnforcementRegistrationMapper;
import com.zdxt.code.service.INonEnforcementRegistrationService;
import com.zdxt.common.annotation.DataScope;
import com.zdxt.common.util.CommonUtil;
import com.zdxt.common.util.Convert;
import com.zdxt.common.util.DateUtils;
import com.zdxt.common.util.StringUtils;
import com.zdxt.common.util.*;
import com.zdxt.common.zdxtFile.ZdxtFileCommon;
import com.zdxt.domain.auth.DictData;
import org.apache.poi.hssf.usermodel.*;
@ -288,7 +286,8 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg
// 设置excel
private void setExcel(HSSFSheet sheet,NonEnforcementRegistration param) throws Exception{
List<NonEnforcementRegistration> list=getList(param);
// List<EnforcementRegistration> list = SpringUtils.getAopProxy(this).selectEnforcementRegistrationAndAddressList(enforcementRegistration);
List<NonEnforcementRegistration> list=SpringUtils.getAopProxy(this).getList(param);
if(list.size()==0)return;
final int[] i = {1};
list.forEach(li->{

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

@ -75,33 +75,40 @@ public class SrzUserServiceImpl implements ISrzUserService
int insertNum = 0;
int updateNum = 0;
for (int i = 0; i < dataArr.size(); i++) {
JSONObject jsonObject = dataArr.getJSONObject(i);
if (StringUtils.isEmpty(jsonObject.getString("userId"))) { continue; }
try {
// 返回每条拉取的成功情况
String taskId = jsonObject.getString("taskId");
String params = "{\"token\":\"" + token + "\",\"data\":[{\"taskId\":\"" + taskId + "\",\"result\":\"SUCCESS\"}]}";
String doneStr = connect("/ebus/sfrzhqxglmk/sysDoneTacc", params);
JSONObject doneObj = JSONObject.parseObject(doneStr);
String done = doneObj.getString("success");
log.info("用户拉取完成结果 ========> {} :{}", taskId, done);
JSONObject jsonObject = dataArr.getJSONObject(i);
if (StringUtils.isEmpty(jsonObject.getString("userId"))) {
continue;
}
try {
// 返回每条拉取的成功情况
String taskId = jsonObject.getString("taskId");
String params = "{\"token\":\"" + token + "\",\"data\":[{\"taskId\":\"" + taskId + "\",\"result\":\"SUCCESS\"}]}";
String doneStr = connect("/ebus/sfrzhqxglmk/sysDoneTacc", params);
JSONObject doneObj = JSONObject.parseObject(doneStr);
String done = doneObj.getString("success");
log.info("用户拉取完成结果 ========> {} :{}", taskId, done);
} catch (Exception e) {
log.info("用户数据下拉完成异常,异常任务id:{}", jsonObject.getString("taskId"));
e.printStackTrace();
}
SrzUser srzUser = JSONObject.parseObject(jsonObject.toString(), SrzUser.class);
if (srzUser == null) continue;
SrzUser temp = srzUserMapper.selectUserByPrimaryKey(srzUser.getUserId());
srzUser.setNeedUpdate(0);
// if (null != temp && temp.getOrganizationId() != null) {
if (null != temp) {
// 跟新数据库
int rowNum = srzUserMapper.updateUser(srzUser);
updateNum += rowNum;
} else {
// 插入数据库
int rowNum = srzUserMapper.insertUser(srzUser);
insertNum += rowNum;
}
} catch (Exception e) {
log.info("用户数据下拉完成异常,异常任务id:{}", jsonObject.getString("taskId"));
e.printStackTrace();
}
SrzUser srzUser=JSONObject.parseObject(jsonObject.toString(),SrzUser.class);
if(srzUser==null)continue;
SrzUser temp = srzUserMapper.selectUserByPrimaryKey(srzUser.getUserId());
srzUser.setNeedUpdate(0);
if (null != temp && temp.getOrganizationId() != null) {
// 跟新数据库
int rowNum = srzUserMapper.updateUser(srzUser);
updateNum += rowNum;
} else {
// 插入数据库
int rowNum = srzUserMapper.insertUser(srzUser);
insertNum += rowNum;
log.info("用户数据同步异常. 暂不处理继续拉去");
}
}
Map<String, Integer> resMap = new HashedMap();

5
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml

@ -100,6 +100,11 @@
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
and DATE_FORMAT(e.enforcement_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
</if>
<!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</where>
order by e.enterprise_name
</select>

Loading…
Cancel
Save