补充 机设部 业务部 综合办公室 隐患统计增加统计的内容
parent
a450bcda16
commit
23f3f9bcc1
2
pom.xml
2
pom.xml
|
|
@ -268,7 +268,7 @@
|
|||
<dependency>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<version>1.1.12</version>
|
||||
<version>1.1.13</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>com.alibaba</groupId>
|
||||
|
|
|
|||
|
|
@ -158,8 +158,7 @@ public class HiddenApiController extends BaseController {
|
|||
* 隐患图片 ，隐患视频 自己通过上传附件上传，暂时不处理
|
||||
*/
|
||||
/** 缺少必填参数:RISK_UNIT IDENTIFICATION RISK_POSITION 暂存 */
|
||||
String serl = "SOURCE,HIDDENDESCR,DISCOVERYTIME,RECTIFICATIONTYPE,HIDDENLEVEL," +
|
||||
"HIDDENTYPE,ISRELEVANT";
|
||||
String serl = "SOURCE,HIDDENDESCR,DISCOVERYTIME,RECTIFICATIONTYPE,HIDDENLEVEL," + "HIDDENTYPE,ISRELEVANT";
|
||||
|
||||
if ("2".equals(pd.getString("SOURCE")) || "6".equals(pd.getString("SOURCE"))) {//如果是清单检查，需要填入其他必填项
|
||||
// serl +=",RISK_UNIT,IDENTIFICATION,RISK_DESCR,RISK_POSITION,LEVEL,CHECK_CONTENT";
|
||||
|
|
@ -233,8 +232,7 @@ public class HiddenApiController extends BaseController {
|
|||
notRepr.put("params2", "隐患确认");//
|
||||
}
|
||||
notRepr.put("params3", "确认");//
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患需要确认", Jurisdiction.getCORPINFO_ID(), pd.getString("CONFIRM_USER"), pd.getString("HIDDEN_ID"),
|
||||
pd.getString("HIDDENDESCR"), "隐患确认", "确认", "", "");
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患需要确认", Jurisdiction.getCORPINFO_ID(), pd.getString("CONFIRM_USER"), pd.getString("HIDDEN_ID"), pd.getString("HIDDENDESCR"), "隐患确认", "确认", "", "");
|
||||
/**
|
||||
* 可以为空的
|
||||
* POSITIONDESC 隐患位置描述
|
||||
|
|
@ -372,8 +370,6 @@ public class HiddenApiController extends BaseController {
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
map.put("hImgs", imgMapListAll.get("3"));// 隐患图片
|
||||
map.put("rImgs", imgMapListAll.get("4"));// 整改图片
|
||||
map.put("fcImgs", imgMapListAll.get("50"));// 安全环保检查验收图片
|
||||
|
|
@ -438,8 +434,7 @@ public class HiddenApiController extends BaseController {
|
|||
code = hiddenApiService.goEmis(pd);
|
||||
return ResultCodeConstant.resMap(code); //隐患走到这就完成了
|
||||
}
|
||||
if ("hiddenLevel1001".equals(pd.getString("HIDDENLEVEL")) ||
|
||||
"1".equals(hidden.get("RECTIFICATIONTYPE").toString())) {
|
||||
if ("hiddenLevel1001".equals(pd.getString("HIDDENLEVEL")) || "1".equals(hidden.get("RECTIFICATIONTYPE").toString())) {
|
||||
// 如果是忽略隐患 或者是立即整改
|
||||
pd.put("STATE", "4");
|
||||
// 隐患状态修改成整改完成
|
||||
|
|
@ -469,13 +464,9 @@ public class HiddenApiController extends BaseController {
|
|||
PageData confirm = hiddenApiService.confirmHidden(pd); //确认
|
||||
pd.put("confirm", JSON.toJSONString(confirm));
|
||||
if (Tools.notEmpty(pd.getString("RECTIFICATIONOR")) && !hidden.getString("RECTIFICATIONTYPE").equals("1")) {
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_002", "友情提示：有一条隐患需要整改",
|
||||
hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"),
|
||||
hidden.getString("HIDDENDESCR"), "隐患整改", "整改", "", "");
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_002", "友情提示：有一条隐患需要整改", hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"), hidden.getString("HIDDENDESCR"), "隐患整改", "整改", "", "");
|
||||
} else if ("1".equals(hidden.getString("RECTIFICATIONTYPE"))) {
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_003", "友情提示：有一条隐患已验收",
|
||||
hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"),
|
||||
hidden.getString("HIDDENDESCR"), "通过", "整改", "", "");
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_003", "友情提示：有一条隐患已验收", hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"), hidden.getString("HIDDENDESCR"), "通过", "整改", "", "");
|
||||
}
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
return ResultCodeConstant.resMap(code, map);
|
||||
|
|
@ -522,9 +513,7 @@ public class HiddenApiController extends BaseController {
|
|||
pd.put("before", JSON.toJSONString(before));
|
||||
List<PageData> hiddenUserList = hiddenUserApiService.getListByHiddenId(pd.getString("HIDDEN_ID"));
|
||||
for (PageData pageData : hiddenUserList) {
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患被打回",
|
||||
Jurisdiction.getCORPINFO_ID(), pageData.getString("USER_ID"), pd.getString("HIDDEN_ID"),
|
||||
pd.getString("HIDDENDESCR"), "上报", "查看", "", "");
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患被打回", Jurisdiction.getCORPINFO_ID(), pageData.getString("USER_ID"), pd.getString("HIDDEN_ID"), pd.getString("HIDDENDESCR"), "上报", "查看", "", "");
|
||||
}
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
return ResultCodeConstant.resMap(code, map);
|
||||
|
|
@ -573,8 +562,7 @@ public class HiddenApiController extends BaseController {
|
|||
}
|
||||
PageData hidden = hiddenApiService.findById(pd); //获取隐患信息
|
||||
/** 整改,修改隐患信息 **/
|
||||
int hiddenupdateSate = hiddenApiService.rectify(pd.getString("HIDDEN_ID"), pd.getString("RECTIFYDESCR"),
|
||||
pd.getString("RECTIFICATIONTIME"), pd.getString("HAVESCHEME"), pd.getString("INVESTMENT_FUNDS"));
|
||||
int hiddenupdateSate = hiddenApiService.rectify(pd.getString("HIDDEN_ID"), pd.getString("RECTIFYDESCR"), pd.getString("RECTIFICATIONTIME"), pd.getString("HAVESCHEME"), pd.getString("INVESTMENT_FUNDS"));
|
||||
map.put("hiddenupdateSate", hiddenupdateSate);
|
||||
if ("1".equals(pd.getString("HAVESCHEME"))) { //如果有整改方案 添加上整改方案
|
||||
pd.put("HIDDENSCHEME_ID", this.get32UUID());
|
||||
|
|
@ -614,8 +602,7 @@ public class HiddenApiController extends BaseController {
|
|||
@RequiresPermissions("hidden:list")
|
||||
@ResponseBody
|
||||
@DockAnnotation(isAdd = true)
|
||||
public Object
|
||||
unableRectify() throws Exception {
|
||||
public Object unableRectify() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
Integer code = 000000;
|
||||
PageData pd = new PageData();
|
||||
|
|
@ -648,9 +635,7 @@ public class HiddenApiController extends BaseController {
|
|||
examine.put("OPERATTIME", DateUtil.date2Str(new Date()));
|
||||
examine = hiddenExamineApiService.save(examine);
|
||||
pd.put("examine", JSON.toJSONString(examine));
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_005", "友情提示：有一条隐患需要特殊审核",
|
||||
hidden.getString("CORPINFO_ID"), hidden.getString("CONFIRM_USER"), hidden.getString("HIDDEN_ID"),
|
||||
hidden.getString("HIDDENDESCR"), "特殊处置审核", "审核", "", "");
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_005", "友情提示：有一条隐患需要特殊审核", hidden.getString("CORPINFO_ID"), hidden.getString("CONFIRM_USER"), hidden.getString("HIDDEN_ID"), hidden.getString("HIDDENDESCR"), "特殊处置审核", "审核", "", "");
|
||||
map.put("msg", "隐患特殊处理申请成功。请通知隐患确认人进行特殊处理确认操作！");
|
||||
|
||||
/** 暂时没有整理 **/
|
||||
|
|
@ -724,9 +709,7 @@ public class HiddenApiController extends BaseController {
|
|||
}
|
||||
examine = hiddenExamineApiService.save(examine);
|
||||
pd.put("examine", JSON.toJSONString(examine));
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_007", "友情提示：有一条隐患需要延期审核",
|
||||
hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"),
|
||||
hidden.getString("HIDDENDESCR"), "延期审核", "审核", "", "");
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_007", "友情提示：有一条隐患需要延期审核", hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"), hidden.getString("HIDDENDESCR"), "延期审核", "审核", "", "");
|
||||
map.put("msg", "隐患延期申成功。请通知隐患确认人进行延期确认操作！");
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
return ResultCodeConstant.resMap(code, map);
|
||||
|
|
@ -831,9 +814,7 @@ public class HiddenApiController extends BaseController {
|
|||
PageData exam = hiddenExamineApiService.saveRepulseCheck(pd.getString("HIDDEN_ID"), pd.getString("CONTENT"));
|
||||
pd.put("exam", JSON.toJSONString(exam));
|
||||
/** 给隐患整改人发送站内信**/
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_002", "友情提示：有一条隐患被打回",
|
||||
hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"),
|
||||
hidden.getString("HIDDENDESCR"), "整改", "重新整改", "", "");
|
||||
messageService.sendMessageByParameter("HIDDEN_MAIL_002", "友情提示：有一条隐患被打回", hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"), hidden.getString("HIDDENDESCR"), "整改", "重新整改", "", "");
|
||||
}
|
||||
map.put("check", check);
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
|
|
@ -959,7 +940,9 @@ public class HiddenApiController extends BaseController {
|
|||
return map;
|
||||
}
|
||||
|
||||
/**导出某一个选中项到excel
|
||||
/**
|
||||
* 导出某一个选中项到excel
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -1018,7 +1001,9 @@ public class HiddenApiController extends BaseController {
|
|||
return mv;
|
||||
}
|
||||
|
||||
/**导出某一个选中项到excel
|
||||
/**
|
||||
* 导出某一个选中项到excel
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -1182,23 +1167,17 @@ public class HiddenApiController extends BaseController {
|
|||
List<String> imgKeyId = new ArrayList<>();// 需要查询图片的id标识信息
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id
|
||||
String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件
|
||||
if (Tools.notEmpty(KEYWORDS))
|
||||
pd.put("KEYWORDS", KEYWORDS.trim());
|
||||
if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
|
||||
String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件
|
||||
if (Tools.notEmpty(ISQUALIFIED))
|
||||
pd.put("ISQUALIFIED", ISQUALIFIED.trim());
|
||||
if (Tools.notEmpty(ISQUALIFIED)) pd.put("ISQUALIFIED", ISQUALIFIED.trim());
|
||||
String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件
|
||||
if (Tools.notEmpty(HIDDENLEVELE))
|
||||
pd.put("HIDDENLEVELE", HIDDENLEVELE.trim());
|
||||
if (Tools.notEmpty(HIDDENLEVELE)) pd.put("HIDDENLEVELE", HIDDENLEVELE.trim());
|
||||
String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件
|
||||
if (Tools.notEmpty(STARTTIME))
|
||||
pd.put("STARTTIME", STARTTIME.trim());
|
||||
if (Tools.notEmpty(STARTTIME)) pd.put("STARTTIME", STARTTIME.trim());
|
||||
String STATE = pd.getString("STATE"); // 关键词检索条件
|
||||
if (Tools.notEmpty(STATE))
|
||||
pd.put("STATE", STATE.trim());
|
||||
if (Tools.notEmpty(STATE)) pd.put("STATE", STATE.trim());
|
||||
String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件
|
||||
if (Tools.notEmpty(ENDTIME))
|
||||
pd.put("ENDTIME", ENDTIME + " 23:59:59");
|
||||
if (Tools.notEmpty(ENDTIME)) pd.put("ENDTIME", ENDTIME + " 23:59:59");
|
||||
String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件
|
||||
if (Tools.notEmpty(DISPOSESTATE)) {
|
||||
pd.put("DISPOSESTATE", DISPOSESTATE.trim());
|
||||
|
|
@ -1206,8 +1185,7 @@ public class HiddenApiController extends BaseController {
|
|||
pd.put("USERDEPT", Jurisdiction.getDEPARTMENT_ID());
|
||||
}
|
||||
String IS_SELF = pd.getString("IS_SELF"); // 关键词检索条件
|
||||
if (IS_SELF != null && IS_SELF.equals("1"))
|
||||
pd.put("SELF_USER_ID", Jurisdiction.getUSER_ID());
|
||||
if (IS_SELF != null && IS_SELF.equals("1")) pd.put("SELF_USER_ID", Jurisdiction.getUSER_ID());
|
||||
// 查看隐患信息
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
if (!Jurisdiction.getIS_MAIN().equals("1")) { //主账号
|
||||
|
|
@ -1255,8 +1233,7 @@ public class HiddenApiController extends BaseController {
|
|||
List<PageData> imgList = imgFilesService.listAllByIds(imgpd2);
|
||||
|
||||
Map<String, Integer> imgCount = new HashMap<>();
|
||||
Integer imgTypeMaxCount1 = 1, imgTypeMaxCount2 = 1, imgTypeMaxCount3 = 1, imgTypeMaxCount4 = 1,
|
||||
imgTypeMaxCount5 = 1, imgTypeMaxCount6 = 1, imgTypeMaxCount7 = 1, imgTypeMaxCount8 = 1;
|
||||
Integer imgTypeMaxCount1 = 1, imgTypeMaxCount2 = 1, imgTypeMaxCount3 = 1, imgTypeMaxCount4 = 1, imgTypeMaxCount5 = 1, imgTypeMaxCount6 = 1, imgTypeMaxCount7 = 1, imgTypeMaxCount8 = 1;
|
||||
|
||||
Map<String, List<String>> imgMap = new HashMap<>();
|
||||
for (int i = 0; i < imgList.size(); i++) {
|
||||
|
|
@ -1485,6 +1462,7 @@ public class HiddenApiController extends BaseController {
|
|||
|
||||
/**
|
||||
* 查询隐患统计表
|
||||
*
|
||||
* @param response
|
||||
* @return
|
||||
* @throws Exception
|
||||
|
|
@ -1503,6 +1481,15 @@ public class HiddenApiController extends BaseController {
|
|||
List<String> bzbdepartmentIds = new ArrayList<>();
|
||||
//卸车部 xcb id集合 aad337cf728b4cc2b63e210caf4e185f
|
||||
List<String> xcbdepartmentIds = new ArrayList<>();
|
||||
|
||||
//0716 新加 机设部298b9a63ea704485913c5185545b4c66
|
||||
List<String> mechanicalDepartmentIds = new ArrayList<>();
|
||||
// 业务部599d9bfcf6c44cb0bc553b1b766aebc5
|
||||
List<String> businessDepartmentIds = new ArrayList<>();
|
||||
// 综合办公室31e47797873d4dd3abdbeb0d99a1f138
|
||||
List<String> generalOfficeDepartmentIds = new ArrayList<>();
|
||||
|
||||
|
||||
//安监部 ajb id集合 4c4b7bc93e3347978f5a3e1f0c4a0b56
|
||||
List<String> ajbdepartmentIds = new ArrayList<>();
|
||||
//开始处理数据 扔进对应结合中
|
||||
|
|
@ -1519,6 +1506,16 @@ public class HiddenApiController extends BaseController {
|
|||
if (StringUtils.equals("4c4b7bc93e3347978f5a3e1f0c4a0b56", department.getDEPARTMENT_ID())) {
|
||||
ajbdepartmentIds = getIdsList(department, ajbdepartmentIds);
|
||||
}
|
||||
//0716 新加 机设部 业务部 综合办公室
|
||||
if (StringUtils.equals("599d9bfcf6c44cb0bc553b1b766aebc5", department.getDEPARTMENT_ID())) {
|
||||
businessDepartmentIds = getIdsList(department, ajbdepartmentIds);
|
||||
}
|
||||
if (StringUtils.equals("31e47797873d4dd3abdbeb0d99a1f138", department.getDEPARTMENT_ID())) {
|
||||
generalOfficeDepartmentIds = getIdsList(department, ajbdepartmentIds);
|
||||
}
|
||||
if (StringUtils.equals("298b9a63ea704485913c5185545b4c66", department.getDEPARTMENT_ID())) {
|
||||
generalOfficeDepartmentIds = getIdsList(department, ajbdepartmentIds);
|
||||
}
|
||||
}
|
||||
//处理日期 类型 年 季度 月
|
||||
String type = pd.getString("type");
|
||||
|
|
@ -1573,6 +1570,10 @@ public class HiddenApiController extends BaseController {
|
|||
pd.put("bzbdepartmentIds", bzbdepartmentIds);
|
||||
pd.put("xcbdepartmentIds", xcbdepartmentIds);
|
||||
pd.put("ajbdepartmentIds", ajbdepartmentIds);
|
||||
|
||||
pd.put("mechanicalDepartmentIds", mechanicalDepartmentIds);
|
||||
pd.put("businessDepartmentIds", businessDepartmentIds);
|
||||
pd.put("generalOfficeDepartmentIds", generalOfficeDepartmentIds);
|
||||
pd.put("startTime", startTime);
|
||||
pd.put("endTime", endTime);
|
||||
//这里获取数据 获取指定日期范围内和指定部门集合创建的隐患总数
|
||||
|
|
@ -1605,6 +1606,7 @@ public class HiddenApiController extends BaseController {
|
|||
|
||||
/**
|
||||
* 导出隐患统计表
|
||||
*
|
||||
* @param response
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -1719,8 +1721,7 @@ public class HiddenApiController extends BaseController {
|
|||
//正则
|
||||
String regex = "\\{\\{.*?\\}\\}";
|
||||
Pattern pattern = Pattern.compile(regex);
|
||||
try (FileInputStream inputStream = new FileInputStream(new File(excelFilePath));
|
||||
Workbook workbook = new XSSFWorkbook(inputStream)) {
|
||||
try (FileInputStream inputStream = new FileInputStream(new File(excelFilePath)); Workbook workbook = new XSSFWorkbook(inputStream)) {
|
||||
Sheet sheet = workbook.getSheetAt(0); // 获取第一个工作表
|
||||
for (Row row : sheet) {
|
||||
for (Cell cell : row) {
|
||||
|
|
|
|||
|
|
@ -36,8 +36,6 @@ import com.zcloud.entity.PageData;
|
|||
import com.zcloud.entity.system.Role;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import sun.security.krb5.internal.PAData;
|
||||
import sun.util.logging.resources.logging;
|
||||
|
||||
/**
|
||||
* 说明：系统用户处理类
|
||||
|
|
|
|||
|
|
@ -43,7 +43,10 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
private UsersService usersService;
|
||||
@Autowired
|
||||
private HiddenRegionService hiddenRegionService; // 隐患区域维护
|
||||
/**新增
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -51,7 +54,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.save(pd);
|
||||
}
|
||||
|
||||
/**删除
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -59,7 +64,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.delete(pd);
|
||||
}
|
||||
|
||||
/**修改
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -67,7 +74,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.edit(pd);
|
||||
}
|
||||
|
||||
/**修改信息
|
||||
/**
|
||||
* 修改信息
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -75,7 +84,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.editInfo(pd);
|
||||
}
|
||||
|
||||
/**修改位置描述信息
|
||||
/**
|
||||
* 修改位置描述信息
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -83,7 +94,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.editInformation(pd);
|
||||
}
|
||||
|
||||
/**修改安全环保检查隐患信息
|
||||
/**
|
||||
* 修改安全环保检查隐患信息
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -94,11 +107,14 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
public void editISCONFIRM(PageData pd) throws Exception {
|
||||
hiddenMapper.editISCONFIRM(pd);
|
||||
}
|
||||
|
||||
public void editHIDDENLEVEL(PageData pd) throws Exception {
|
||||
hiddenMapper.editHIDDENLEVEL(pd);
|
||||
}
|
||||
|
||||
/**提交隐患
|
||||
/**
|
||||
* 提交隐患
|
||||
*
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -106,7 +122,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.submit(pd);
|
||||
}
|
||||
|
||||
/**修改
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -114,7 +132,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.changeState(pd);
|
||||
}
|
||||
|
||||
/**定时修改过期隐患
|
||||
/**
|
||||
* 定时修改过期隐患
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -122,7 +142,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.editDeadline(pd);
|
||||
}
|
||||
|
||||
/**修改延期隐患为未整改
|
||||
/**
|
||||
* 修改延期隐患为未整改
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -130,7 +152,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.editDeferredDeadline(pd);
|
||||
}
|
||||
|
||||
/**验收
|
||||
/**
|
||||
* 验收
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -138,7 +162,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.check(pd);
|
||||
}
|
||||
|
||||
/**安全环保检查验收
|
||||
/**
|
||||
* 安全环保检查验收
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -146,7 +172,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.finalcheck(pd);
|
||||
}
|
||||
|
||||
/**复查
|
||||
/**
|
||||
* 复查
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -154,7 +182,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.review(pd);
|
||||
}
|
||||
|
||||
/**整改
|
||||
/**
|
||||
* 整改
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -162,7 +192,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.rectify(pd);
|
||||
}
|
||||
|
||||
/**列表
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -170,39 +202,53 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
return hiddenMapper.datalistPage(page);
|
||||
}
|
||||
|
||||
/**列表(全部)
|
||||
/**
|
||||
* 列表(全部)
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAll(PageData pd) throws Exception {
|
||||
return hiddenMapper.listAll(pd);
|
||||
}
|
||||
/**列表(全部,打印使用)
|
||||
|
||||
/**
|
||||
* 列表(全部,打印使用)
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> listAllToPrint(PageData pd) throws Exception {
|
||||
return hiddenMapper.listAllToPrint(pd);
|
||||
}
|
||||
|
||||
public List<PageData> listHiddenAll(PageData pd) throws Exception {
|
||||
return hiddenMapper.listHiddenAll(pd);
|
||||
}
|
||||
|
||||
/**通过id获取数据
|
||||
/**
|
||||
* 通过id获取数据
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findById(PageData pd) throws Exception {
|
||||
return hiddenMapper.findById(pd);
|
||||
}
|
||||
/**通过id获取数据
|
||||
|
||||
/**
|
||||
* 通过id获取数据
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public PageData findByEmisId(PageData pd) throws Exception {
|
||||
return hiddenMapper.findByEmisId(pd);
|
||||
}
|
||||
/**批量删除
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -215,7 +261,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.deleteArray(pd);
|
||||
}
|
||||
|
||||
/**批量修改
|
||||
/**
|
||||
* 批量修改
|
||||
*
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -223,7 +271,9 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
hiddenMapper.updateAll(hiddens);
|
||||
}
|
||||
|
||||
/**按日统计
|
||||
/**
|
||||
* 按日统计
|
||||
*
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -231,15 +281,19 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
return hiddenMapper.hiddenStatisticsByDay(pd);
|
||||
}
|
||||
|
||||
/**总数统计
|
||||
/**
|
||||
* 总数统计
|
||||
*
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> hiddenStatisticsAll(PageData pd) throws Exception {
|
||||
return hiddenMapper.hiddenStatisticsAll(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* app首页 根据用户ID获取发现隐患信息
|
||||
*
|
||||
* @param pd CREATOR
|
||||
* @return
|
||||
* @throws Exception
|
||||
|
|
@ -247,8 +301,10 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
public List<PageData> getCountByCreatorId(PageData pd) throws Exception {
|
||||
return hiddenMapper.getCountByCreatorId(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* app首页 根据用户ID获取整改隐患信息
|
||||
*
|
||||
* @param pd CREATOR
|
||||
* @return
|
||||
* @throws Exception
|
||||
|
|
@ -259,6 +315,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
|
||||
/**
|
||||
* app首页根据用户ID获取待验收隐患
|
||||
*
|
||||
* @param pd
|
||||
* @return
|
||||
* @throws Exception
|
||||
|
|
@ -269,6 +326,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
|
||||
/**
|
||||
* app应用页面根据用户ID获取待确认隐患
|
||||
*
|
||||
* @param pd
|
||||
* @return
|
||||
* @throws Exception
|
||||
|
|
@ -279,6 +337,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
|
||||
/**
|
||||
* app应用页面根据用户ID获取特殊处置隐患
|
||||
*
|
||||
* @param pd
|
||||
* @return
|
||||
* @throws Exception
|
||||
|
|
@ -289,6 +348,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
|
||||
/**
|
||||
* 根据企业ID获取驾驶舱隐患统计信息
|
||||
*
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -298,6 +358,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
|
||||
/**
|
||||
* 清单其他隐患
|
||||
*
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -318,23 +379,30 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
public List<PageData> getCountByHiddenType(PageData pd) throws Exception {
|
||||
return hiddenMapper.getCountByHiddenType(pd);
|
||||
}
|
||||
/**按日统计
|
||||
|
||||
/**
|
||||
* 按日统计
|
||||
*
|
||||
* @param ArrayDATA_IDS
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> getHiddenNum(PageData pd) throws Exception {
|
||||
return hiddenMapper.getHiddenNum(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 确认隐患，修改隐患状态
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
public void confirmHidden(PageData pd) throws Exception {
|
||||
hiddenMapper.confirmHidden(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改隐患信息，隐患级别 ，整改负责人 ， 整改期限
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -360,8 +428,10 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
|
||||
this.updateStateByHidden("7", pageData.get("HIDDEN_ID").toString()); //修改隐患状态
|
||||
}
|
||||
|
||||
/**
|
||||
* 隐患列表 -- 港务局
|
||||
*
|
||||
* @param page
|
||||
* @return
|
||||
* @throws Exception
|
||||
|
|
@ -372,6 +442,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
|
||||
/**
|
||||
* 忽略隐患列表 -- 港务局
|
||||
*
|
||||
* @param page
|
||||
* @return
|
||||
* @throws Exception
|
||||
|
|
@ -382,6 +453,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
|
||||
/**
|
||||
* 重大隐患列表 -- 港务局
|
||||
*
|
||||
* @param page
|
||||
* @return
|
||||
* @throws Exception
|
||||
|
|
@ -392,6 +464,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
|
||||
/**
|
||||
* 修改隐患整改期限
|
||||
*
|
||||
* @param pd
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -416,6 +489,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
|
||||
/**
|
||||
* 修改隐患整改人
|
||||
*
|
||||
* @param userId
|
||||
* @param deptId
|
||||
* @throws Exception
|
||||
|
|
@ -467,6 +541,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
|
||||
/**
|
||||
* 重大隐患核实列表 -- 港务局
|
||||
*
|
||||
* @param page
|
||||
* @return
|
||||
* @throws Exception
|
||||
|
|
@ -477,6 +552,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
|
||||
/**
|
||||
* 重大隐患列表 -- 港务局
|
||||
*
|
||||
* @param page
|
||||
* @return
|
||||
* @throws Exception
|
||||
|
|
@ -523,12 +599,15 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
public List<PageData> listOtherNotAccept(PageData pd) throws Exception {
|
||||
return hiddenMapper.listOtherNotAccept(pd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> listOtherNotAccept4pc(PageData pd) throws Exception {
|
||||
return hiddenMapper.listOtherNotAccept4pc(pd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取检查记录的隐患
|
||||
*
|
||||
* @param pd
|
||||
* @return
|
||||
* @throws Exception
|
||||
|
|
@ -540,6 +619,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
|
||||
/**
|
||||
* 通过安全检查ID获取隐患
|
||||
*
|
||||
* @param pd
|
||||
* @return
|
||||
* @throws Exception
|
||||
|
|
@ -558,44 +638,57 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
public List<PageData> findByKey(PageData condition) throws Exception {
|
||||
return hiddenMapper.findByKey(condition);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> findByQue(PageData condition) throws Exception {
|
||||
return hiddenMapper.findByQue(condition);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> findByTs(PageData condition) throws Exception {
|
||||
return hiddenMapper.findByTs(condition);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> findByYin(PageData condition) throws Exception {
|
||||
return hiddenMapper.findByYin(condition);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PageData> statisticsHiddenCountByLevel(PageData pd) throws Exception {
|
||||
return hiddenMapper.statisticsHiddenCountByLevel(pd);
|
||||
}
|
||||
|
||||
/**列表
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> getListForTianzhang(Page page) throws Exception {
|
||||
return hiddenMapper.getListForTianzhangdatalistPage(page);
|
||||
}
|
||||
/**列表
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
public List<PageData> getListForemis(Page page) throws Exception {
|
||||
return hiddenMapper.getListForemisdatalistPage(page);
|
||||
}
|
||||
|
||||
public void saveForEmis(String hiddenId, String resXML) throws Exception {
|
||||
PageData pd = new PageData();
|
||||
pd.put("HIDDEN_ID", hiddenId);
|
||||
pd.put("resXML", resXML);
|
||||
hiddenMapper.saveForEmis(pd);
|
||||
}
|
||||
/**删除
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -604,6 +697,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
pd.put("HIDDEN_ID", hiddenId);
|
||||
hiddenMapper.deleteForEmis(pd);
|
||||
}
|
||||
|
||||
public String goEmis(PageData pd) throws Exception {
|
||||
String result = "";
|
||||
// 1.整理数据
|
||||
|
|
@ -650,7 +744,8 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
String JCR = dianjianUser.get("JCR").toString(); // 检查人
|
||||
String JCLX = pd.getString("JCLX"); // 检查类型t_b_jclx--fid
|
||||
String SBDL = hiddenRegionPar.getString("SBDL"); // 设备大类t_b_sbdlxx--sbdlxxdm
|
||||
String SBMC = hiddenRegion.getString("SBMC");; // 设备名称t_b_shebeixx--shebeidm
|
||||
String SBMC = hiddenRegion.getString("SBMC");
|
||||
; // 设备名称t_b_shebeixx--shebeidm
|
||||
String DJWT = hiddenPd.getString("HIDDENDESCR"); // 点检问题
|
||||
String CJR = dianjianUser.get("JCR").toString(); // 创建人
|
||||
String CJSJ = DateUtil.date2Str(new Date()); // 创建时间
|
||||
|
|
@ -706,6 +801,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
return resXML;
|
||||
}
|
||||
}
|
||||
|
||||
public void updateGoConfirm(PageData hiddens) throws Exception {
|
||||
hiddenMapper.updateGoConfirm(hiddens);
|
||||
}
|
||||
|
|
@ -722,14 +818,91 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
List<PageData> zcPageDataList = hiddenMapper.getExcelZc(pageData);
|
||||
//stream分组
|
||||
Map<String, List<PageData>> groupByTypeList = zcPageDataList.stream().collect(Collectors.groupingBy(item -> item.getString("type")));
|
||||
//mechanicalDepartmentIds
|
||||
//businessDepartmentIds
|
||||
//generalOfficeDepartmentIds
|
||||
// ----------------------
|
||||
// 综合办公室
|
||||
List<PageData> generalOffice = groupByTypeList.get("generalOffice");
|
||||
if (!Tools.isEmpty(generalOffice)) {
|
||||
map.put("generalOfficeZcZs", generalOffice.size()); //总数
|
||||
List<PageData> zcbZcWc = generalOffice.stream().filter(item -> StringUtils.equals("4", item.getString("STATE"))).collect(Collectors.toList());
|
||||
int zijin = generalOffice.stream().filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+")).mapToInt(item -> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
if (!Tools.isEmpty(zcbZcWc)) {
|
||||
map.put("generalOfficeZcZg", zcbZcWc.size());
|
||||
map.put("generalOfficeZcWwcZg", generalOffice.size() - zcbZcWc.size());
|
||||
BigDecimal result = new BigDecimal(zcbZcWc.size()).divide(new BigDecimal(generalOffice.size()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
|
||||
map.put("generalOfficeZcZgl", result.intValue() + "%"); //整改率
|
||||
} else {
|
||||
map.put("generalOfficeZcZg", "0");
|
||||
map.put("generalOfficeWwcZg", zcbZcWc.size());
|
||||
map.put("generalOfficeZcZgl", "0%"); //整改率
|
||||
}
|
||||
map.put("generalOfficeZcZgZj", zijin); //资金
|
||||
} else {
|
||||
map.put("generalOfficeZcZs", "0"); //总数
|
||||
map.put("generalOfficeZcZg", "0"); //整改数
|
||||
map.put("generalOfficeZcWwcZg", "0"); //整改未完成数
|
||||
map.put("generalOfficeZcZgl", "0%"); //整改率
|
||||
map.put("generalOfficeZcZgZj", "0"); //资金
|
||||
}
|
||||
// 业务部
|
||||
List<PageData> business = groupByTypeList.get("business");
|
||||
if (!Tools.isEmpty(business)) {
|
||||
map.put("businessZcZs", business.size()); //总数
|
||||
List<PageData> zcbZcWc = business.stream().filter(item -> StringUtils.equals("4", item.getString("STATE"))).collect(Collectors.toList());
|
||||
int zijin = business.stream().filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+")).mapToInt(item -> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
if (!Tools.isEmpty(zcbZcWc)) {
|
||||
map.put("businessZcZg", zcbZcWc.size());
|
||||
map.put("businessZcWwcZg", business.size() - zcbZcWc.size());
|
||||
BigDecimal result = new BigDecimal(zcbZcWc.size()).divide(new BigDecimal(business.size()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
|
||||
map.put("businessZcZgl", result.intValue() + "%"); //整改率
|
||||
} else {
|
||||
map.put("businessZcZg", "0");
|
||||
map.put("businessWwcZg", zcbZcWc.size());
|
||||
map.put("businessZcZgl", "0%"); //整改率
|
||||
}
|
||||
map.put("businessZcZgZj", zijin); //资金
|
||||
} else {
|
||||
map.put("businessZcZs", "0"); //总数
|
||||
map.put("businessZcZg", "0"); //整改数
|
||||
map.put("businessZcWwcZg", "0"); //整改未完成数
|
||||
map.put("businessZcZgl", "0%"); //整改率
|
||||
map.put("businessZcZgZj", "0"); //资金
|
||||
}
|
||||
//机设部自查数据
|
||||
List<PageData> mechanical = groupByTypeList.get("mechanical");
|
||||
if (!Tools.isEmpty(mechanical)) {
|
||||
map.put("mechanicalZcZs", mechanical.size()); //总数
|
||||
List<PageData> zcbZcWc = mechanical.stream().filter(item -> StringUtils.equals("4", item.getString("STATE"))).collect(Collectors.toList());
|
||||
int zijin = mechanical.stream().filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+")).mapToInt(item -> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
if (!Tools.isEmpty(zcbZcWc)) {
|
||||
map.put("mechanicalZcZg", zcbZcWc.size());
|
||||
map.put("mechanicalZcWwcZg", mechanical.size() - zcbZcWc.size());
|
||||
BigDecimal result = new BigDecimal(zcbZcWc.size()).divide(new BigDecimal(mechanical.size()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
|
||||
map.put("mechanicalZcZgl", result.intValue() + "%"); //整改率
|
||||
} else {
|
||||
map.put("mechanicalZcZg", "0");
|
||||
map.put("mechanicalZcWwcZg", zcbZcWc.size());
|
||||
map.put("mechanicalZcZgl", "0%"); //整改率
|
||||
}
|
||||
map.put("mechanicalZcZgZj", zijin); //资金
|
||||
} else {
|
||||
map.put("mechanicalZcZs", "0"); //总数
|
||||
map.put("mechanicalZcZg", "0"); //整改数
|
||||
map.put("mechanicalZcWwcZg", "0"); //整改未完成数
|
||||
map.put("mechanicalZcZgl", "0%"); //整改率
|
||||
map.put("mechanicalZcZgZj", "0"); //资金
|
||||
}
|
||||
|
||||
|
||||
// ----------------------
|
||||
//装船部自查数据
|
||||
List<PageData> zcbZc = groupByTypeList.get("zcbzc");
|
||||
if (!Tools.isEmpty(zcbZc)) {
|
||||
map.put("zcbZcZs", zcbZc.size()); //总数
|
||||
List<PageData> zcbZcWc = zcbZc.stream().filter(item -> StringUtils.equals("4", item.getString("STATE"))).collect(Collectors.toList());
|
||||
int zijin = zcbZc.stream()
|
||||
.filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+"))
|
||||
.mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
int zijin = zcbZc.stream().filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+")).mapToInt(item -> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
if (!Tools.isEmpty(zcbZcWc)) {
|
||||
map.put("zcbZcZg", zcbZcWc.size());
|
||||
map.put("zcbZcWwcZg", zcbZc.size() - zcbZcWc.size());
|
||||
|
|
@ -753,9 +926,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
if (!Tools.isEmpty(xcbZc)) {
|
||||
map.put("xcbZcZs", xcbZc.size()); //总数
|
||||
List<PageData> xcbZcWc = xcbZc.stream().filter(item -> StringUtils.equals("4", item.getString("STATE"))).collect(Collectors.toList());
|
||||
int zijin = xcbZc.stream()
|
||||
.filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+"))
|
||||
.mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
int zijin = xcbZc.stream().filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+")).mapToInt(item -> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
if (!Tools.isEmpty(xcbZcWc)) {
|
||||
map.put("xcbZcZg", xcbZcWc.size());
|
||||
map.put("xcbZcWwcZg", xcbZc.size() - xcbZcWc.size());
|
||||
|
|
@ -779,9 +950,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
if (!Tools.isEmpty(bzbZc)) {
|
||||
map.put("bzbZcZs", bzbZc.size()); //总数
|
||||
List<PageData> bzbZcWc = bzbZc.stream().filter(item -> StringUtils.equals("4", item.getString("STATE"))).collect(Collectors.toList());
|
||||
int zijin = bzbZc.stream()
|
||||
.filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+"))
|
||||
.mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
int zijin = bzbZc.stream().filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+")).mapToInt(item -> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
if (!Tools.isEmpty(bzbZcWc)) {
|
||||
map.put("bzbZcZg", bzbZcWc.size());
|
||||
map.put("bzbZcWwcZg", bzbZc.size() - bzbZcWc.size());
|
||||
|
|
@ -809,9 +978,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
if (!Tools.isEmpty(zcbGsc)) {
|
||||
map.put("zcbGscZs", zcbGsc.size()); //总数
|
||||
List<PageData> zcbGscWc = zcbGsc.stream().filter(item -> StringUtils.equals("4", item.getString("STATE"))).collect(Collectors.toList());
|
||||
int zijin = zcbGsc.stream()
|
||||
.filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+"))
|
||||
.mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
int zijin = zcbGsc.stream().filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+")).mapToInt(item -> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
if (!Tools.isEmpty(zcbGscWc)) {
|
||||
map.put("zcbGscZg", zcbGscWc.size());
|
||||
map.put("zcbGscWwcZg", zcbGsc.size() - zcbGscWc.size());
|
||||
|
|
@ -835,9 +1002,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
if (!Tools.isEmpty(xcbGsc)) {
|
||||
map.put("xcbGscZs", xcbGsc.size()); //总数
|
||||
List<PageData> xcbGscWc = xcbGsc.stream().filter(item -> StringUtils.equals("4", item.getString("STATE"))).collect(Collectors.toList());
|
||||
int zijin = xcbGsc.stream()
|
||||
.filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+"))
|
||||
.mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
int zijin = xcbGsc.stream().filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+")).mapToInt(item -> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
if (!Tools.isEmpty(xcbGscWc)) {
|
||||
map.put("xcbGscZg", xcbGscWc.size());
|
||||
map.put("xcbGscWwcZg", xcbGsc.size() - xcbGscWc.size());
|
||||
|
|
@ -861,9 +1026,7 @@ public class HiddenServiceImpl implements HiddenService{
|
|||
if (!Tools.isEmpty(bzbGsc)) {
|
||||
map.put("bzbGscZs", bzbGsc.size()); //总数
|
||||
List<PageData> bzbGscWc = bzbGsc.stream().filter(item -> StringUtils.equals("4", item.getString("STATE"))).collect(Collectors.toList());
|
||||
int zijin = bzbGsc.stream()
|
||||
.filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+"))
|
||||
.mapToInt(item-> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
int zijin = bzbGsc.stream().filter(item -> item.getString("INVESTMENT_FUNDS").matches("\\d+")).mapToInt(item -> Integer.parseInt(item.getString("INVESTMENT_FUNDS"))).sum();
|
||||
if (!Tools.isEmpty(bzbGscWc)) {
|
||||
map.put("bzbGscZg", bzbGscWc.size());
|
||||
map.put("bzbGscWwcZg", bzbGsc.size() - bzbGscWc.size());
|
||||
|
|
|
|||
|
|
@ -1,12 +1,19 @@
|
|||
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no1.url=jdbc:mysql://172.16.130.92:3306/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no1.url=jdbc:mysql://172.16.11.147:33068/qa-cmt-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no1.username=root
|
||||
datasource.no1.password=Zcloud@888888
|
||||
datasource.no1.password=Mysql@zcloud88888
|
||||
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no2.url=jdbc:mysql://172.16.130.92:3306/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no2.url=jdbc:mysql://172.16.11.147:33068/qa-cmt-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no2.username=root
|
||||
datasource.no2.password=Zcloud@888888
|
||||
datasource.no2.password=Mysql@zcloud88888
|
||||
|
||||
|
||||
|
||||
|
||||
datasource.no3.driver-class-name: oracle.jdbc.driver.OracleDriver
|
||||
datasource.no3.url=jdbc:oracle:thin:@172.16.11.75:1521:orcl
|
||||
datasource.no3.username=jkqask
|
||||
datasource.no3.password=Qask@1115
|
||||
#druid???
|
||||
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
|
||||
#?????
|
||||
|
|
@ -49,19 +56,30 @@ spring.http.encoding.force=true
|
|||
spring.http.encoding.enabled=true
|
||||
# ??springboot????banner
|
||||
spring.main.banner-mode=off
|
||||
#jar????????
|
||||
#web.upload-path=h:/
|
||||
#web.front-path=h:/
|
||||
#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path}
|
||||
|
||||
#????????????
|
||||
preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/
|
||||
qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
|
||||
#preventionxgf.api.url=http://192.168.0.79:8088
|
||||
#
|
||||
#qa-regulatory-gwj.api.url=http://192.168.0.79:8008
|
||||
|
||||
smb.host=39.101.130.96
|
||||
smb.port=22
|
||||
preventionxgf.api.url=http://192.168.0.79:8088/
|
||||
qa-regulatory-gwj.api.url=http://192.168.0.79:8092/
|
||||
# tongbu地址
|
||||
tongbu.api.url=http://192.168.192.201:8971/qa-prevention-gwj-tongbu/
|
||||
|
||||
|
||||
#?????
|
||||
smb.host=172.16.11.146
|
||||
smb.port=18822
|
||||
smb.user=root
|
||||
smb.password=Zcloud@zcloud88888
|
||||
smb.basePath=/mnt/wwag/file/
|
||||
smb.password=Sysadmin@m2q@XXB
|
||||
smb.basePath=/mnt/web/file/
|
||||
|
||||
#mq???????????
|
||||
rocketmq.name-server=172.16.130.91:9876
|
||||
#Mq\u914D\u7F6E
|
||||
rocketmq.name-server=172.16.11.146:9876
|
||||
rocketmq.producer.group=libmiddle
|
||||
rocketmq.producer.send-message-timeout=300000
|
||||
rocketmq.producer.compress-message-body-threshold=4096
|
||||
|
|
@ -69,29 +87,48 @@ rocketmq.producer.max-message-size=4194304
|
|||
rocketmq.producer.retry-times-when-send-failed=3
|
||||
rocketmq.producer.retry-next-server=true
|
||||
rocketmq.producer.retry-times-when-send-async-failed=3
|
||||
## topic ????
|
||||
|
||||
## topic \u524D\u7F00
|
||||
mq.topic.info=info
|
||||
mq.topic.eightWork=eightWork
|
||||
mq.group.info=scheduled_tasks
|
||||
mq.group.eightWork=scheduled_tasks_eightWork
|
||||
|
||||
# topic ????
|
||||
mq.topic.docking=docking
|
||||
mq.topic.dockingPicture=dockingPicture
|
||||
mq.group.docking=scheduled_tasks_docking
|
||||
|
||||
#???? ??????
|
||||
perLoc.url=http://172.16.130.86/gateway-service
|
||||
perLoc.userName=qaaqadmin
|
||||
perLoc.pwd=Cfd2023@
|
||||
# \u4EBA\u5458\u5BF9\u63A5
|
||||
perLoc.url=http://172.16.11.145:8888
|
||||
# \u6E2F\u80A1\u4F01\u4E1A\u7AEF-app\u767B\u5F55\u9ED8\u8BA4 \u6587\u4EF6\u670D\u52A1\u5668\u5730\u5740\uFF08\u66F9\u7164\u70AD\u4E0D\u7528\uFF09
|
||||
corp.default.pic-path=https://qgqy.qhdsafety.com/file/
|
||||
# \u6E2F\u80A1\u4F01\u4E1A\u7AEF-app\u767B\u5F55\u9ED8\u8BA4 \u540E\u53F0\u5730\u5740\u5730\u5740\uFF08\u66F9\u7164\u70AD\u4E0D\u7528\uFF09
|
||||
corp.default.back-end-path=https://qgqy.qhdsafety.com/
|
||||
# \u672C\u670D\u52A1\u56FE\u7247\u5730\u5740
|
||||
http.file.url=http://172.16.11.146:8991/file/
|
||||
# \u672C\u670D\u52A1\u56FE\u7247\u5730\u5740
|
||||
baseimgpath =http://10.30.20.146:8991/file/
|
||||
|
||||
#????? ??????
|
||||
corp.default.pic-path=https://qgqy.qhdsafety.com/
|
||||
corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
|
||||
|
||||
#??????
|
||||
http.file.url=http://172.16.130.91:9004/file/
|
||||
#??????
|
||||
baseimgpath =http://172.16.130.91:9004/file/
|
||||
cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd
|
||||
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
|
||||
spring.redis.database=0
|
||||
# Redis\u670D\u52A1\u5668\u5730\u5740
|
||||
spring.redis.host=172.16.11.146
|
||||
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
|
||||
spring.redis.port=63799
|
||||
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
|
||||
spring.redis.password=redis@zcloud88888
|
||||
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
|
||||
spring.redis.jedis.pool.max-active=20
|
||||
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
|
||||
spring.redis.jedis.pool.max-wait=-1
|
||||
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
|
||||
spring.redis.jedis.pool.max-idle=10
|
||||
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
|
||||
spring.redis.jedis.pool.min-idle=0
|
||||
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
|
||||
spring.redis.timeout=1000
|
||||
|
||||
|
||||
|
||||
# 隐患统计导出模板
|
||||
hidden.count.excel=/mnt/web/excelFile/hiddenCountExcel.xlsx
|
||||
|
|
@ -1,132 +0,0 @@
|
|||
|
||||
|
||||
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no1.username=root
|
||||
datasource.no1.password=Mysql@zcloud88888
|
||||
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no2.username=root
|
||||
datasource.no2.password=Mysql@zcloud88888
|
||||
|
||||
|
||||
datasource.no3.driver-class-name: oracle.jdbc.driver.OracleDriver
|
||||
datasource.no3.url=jdbc:oracle:thin:@172.16.11.75:1521:orcl
|
||||
datasource.no3.username=jkqask
|
||||
datasource.no3.password=Qask@1115
|
||||
#druid???
|
||||
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
|
||||
#?????
|
||||
spring.datasource.maxActive: 20
|
||||
#?????
|
||||
spring.datasource.initialSize: 1
|
||||
#??????????
|
||||
spring.datasource.maxWait: 60000
|
||||
#??PSCache?????????PSCache???
|
||||
spring.datasource.poolPreparedStatements: true
|
||||
spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20
|
||||
#??connectionProperties?????mergeSql????SQL??
|
||||
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
spring.datasource.minIdle: 1
|
||||
spring.datasource.timeBetweenEvictionRunsMillis: 60000
|
||||
spring.datasource.minEvictableIdleTimeMillis: 300000
|
||||
spring.datasource.validationQuery: select 1 from dual
|
||||
spring.datasource.testWhileIdle: true
|
||||
spring.datasource.testOnBorrow: false
|
||||
spring.datasource.testOnReturn: false
|
||||
#?????????filters????????sql?????,'wall'?????
|
||||
filters: stat, wall, log4j
|
||||
|
||||
#????????
|
||||
spring.cache.ehcache.cofnig=ehcache.xml
|
||||
|
||||
#?????,?????sql??
|
||||
logging.level.com.zcloud.mapper=debug
|
||||
|
||||
#????????
|
||||
spring.servlet.multipart.max-file-size=500MB
|
||||
spring.servlet.multipart.max-request-size=500MB
|
||||
|
||||
#activiti????
|
||||
spring.activiti.check-process-definitions=false
|
||||
|
||||
#??
|
||||
spring.http.encoding.charset=UTF-8
|
||||
spring.http.encoding.force=true
|
||||
spring.http.encoding.enabled=true
|
||||
# ??springboot????banner
|
||||
spring.main.banner-mode=off
|
||||
#jar????????
|
||||
#web.upload-path=h:/
|
||||
#web.front-path=h:/
|
||||
#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path}
|
||||
|
||||
#preventionxgf.api.url=http://192.168.0.79:8088
|
||||
#
|
||||
#qa-regulatory-gwj.api.url=http://192.168.0.79:8008
|
||||
|
||||
preventionxgf.api.url=http://192.168.0.79:8088/
|
||||
qa-regulatory-gwj.api.url=http://192.168.0.79:8092/
|
||||
|
||||
|
||||
#????????????
|
||||
baseimgpath = https://qgqy.qhdsafety.com/
|
||||
|
||||
#?????
|
||||
smb.host=39.103.224.166
|
||||
smb.port=22
|
||||
smb.user=root
|
||||
smb.password=Zcloud@zcloud88888
|
||||
smb.basePath=/mnt/qgfile/file/
|
||||
# \u6CA7\u5DDE\u77FF\u77F3\u7528\u6237\u6807\u8BC6
|
||||
|
||||
#Mq\u914D\u7F6E
|
||||
rocketmq.consumer.group2=edu-admin-edit
|
||||
rocketmq.consumer.group1=edu-admin-add
|
||||
#rocketmq.name-server=10.0.140.141:9876
|
||||
#rocketmq.name-server=192.168.0.70:9876
|
||||
rocketmq.name-server=192.168.151.57:9876
|
||||
rocketmq.producer.group=libmiddle
|
||||
rocketmq.producer.send-message-timeout=3000
|
||||
rocketmq.producer.compress-message-body-threshold=4096
|
||||
rocketmq.producer.max-message-size=4194304
|
||||
rocketmq.producer.retry-times-when-send-failed=3
|
||||
rocketmq.producer.retry-next-server=true
|
||||
rocketmq.producer.retry-times-when-send-async-failed=3
|
||||
## topic \u524D\u7F00
|
||||
|
||||
mq.topic.info=info
|
||||
mq.topic.eightWork=eightWork
|
||||
mq.group.info=scheduled_tasks
|
||||
mq.group.eightWork=scheduled_tasks_eightWork
|
||||
|
||||
corp.default.pic-path=https://qgqy.qhdsafety.com/file/
|
||||
corp.default.back-end-path=http://192.168.151.57:8092/
|
||||
#\u5BF9\u63A5\u4EBA\u5458\u5B9A\u4F4D
|
||||
perLoc.url=http://192.168.210.32:8084
|
||||
perLoc.userName=qaaqadmin
|
||||
perLoc.pwd=Cfd2023@
|
||||
#\u6570\u636E\u540C\u6B65
|
||||
mq.topic.docking=docking
|
||||
mq.group.docking=scheduled_tasks_docking
|
||||
|
||||
cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd
|
||||
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
|
||||
spring.redis.database=0
|
||||
# Redis\u670D\u52A1\u5668\u5730\u5740
|
||||
spring.redis.host=127.0.0.1
|
||||
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
|
||||
spring.redis.port=6379
|
||||
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
|
||||
spring.redis.password=
|
||||
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
|
||||
spring.redis.jedis.pool.max-active=20
|
||||
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
|
||||
spring.redis.jedis.pool.max-wait=-1
|
||||
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
|
||||
spring.redis.jedis.pool.max-idle=10
|
||||
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
|
||||
spring.redis.jedis.pool.min-idle=0
|
||||
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
|
||||
spring.redis.timeout=1000
|
||||
|
||||
|
|
@ -1,120 +0,0 @@
|
|||
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no1.url=jdbc:mysql://172.16.130.92:3306/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no1.username=root
|
||||
datasource.no1.password=Zcloud@888888
|
||||
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no2.url=jdbc:mysql://172.16.130.92:3306/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no2.username=root
|
||||
datasource.no2.password=Zcloud@888888
|
||||
|
||||
datasource.no3.driver-class-name: oracle.jdbc.driver.OracleDriver
|
||||
datasource.no3.url=jdbc:oracle:thin:@172.16.11.75:1521:orcl
|
||||
datasource.no3.username=jkqask
|
||||
datasource.no3.password=Qask@1115
|
||||
#druid???
|
||||
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
|
||||
#?????
|
||||
spring.datasource.maxActive: 20
|
||||
#?????
|
||||
spring.datasource.initialSize: 1
|
||||
#??????????
|
||||
spring.datasource.maxWait: 60000
|
||||
#??PSCache?????????PSCache???
|
||||
spring.datasource.poolPreparedStatements: true
|
||||
spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20
|
||||
#??connectionProperties?????mergeSql????SQL??
|
||||
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
spring.datasource.minIdle: 1
|
||||
spring.datasource.timeBetweenEvictionRunsMillis: 60000
|
||||
spring.datasource.minEvictableIdleTimeMillis: 300000
|
||||
spring.datasource.validationQuery: select 1 from dual
|
||||
spring.datasource.testWhileIdle: true
|
||||
spring.datasource.testOnBorrow: false
|
||||
spring.datasource.testOnReturn: false
|
||||
#?????????filters????????sql?????,'wall'?????
|
||||
filters: stat, wall, log4j
|
||||
|
||||
#????????
|
||||
spring.cache.ehcache.cofnig=ehcache.xml
|
||||
|
||||
#?????,?????sql??
|
||||
logging.level.com.zcloud.mapper=debug
|
||||
|
||||
#????????
|
||||
spring.servlet.multipart.max-file-size=500MB
|
||||
spring.servlet.multipart.max-request-size=500MB
|
||||
|
||||
#activiti????
|
||||
spring.activiti.check-process-definitions=false
|
||||
|
||||
#??
|
||||
spring.http.encoding.charset=UTF-8
|
||||
spring.http.encoding.force=true
|
||||
spring.http.encoding.enabled=true
|
||||
# ??springboot????banner
|
||||
spring.main.banner-mode=off
|
||||
|
||||
#????????????
|
||||
preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/
|
||||
qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
|
||||
|
||||
smb.host=39.101.130.96
|
||||
smb.port=22
|
||||
smb.user=root
|
||||
smb.password=Zcloud@zcloud88888
|
||||
smb.basePath=/mnt/wwag/file/
|
||||
|
||||
#mq???????????
|
||||
rocketmq.name-server=172.16.130.91:9876
|
||||
rocketmq.producer.group=libmiddle
|
||||
rocketmq.producer.send-message-timeout=300000
|
||||
rocketmq.producer.compress-message-body-threshold=4096
|
||||
rocketmq.producer.max-message-size=4194304
|
||||
rocketmq.producer.retry-times-when-send-failed=3
|
||||
rocketmq.producer.retry-next-server=true
|
||||
rocketmq.producer.retry-times-when-send-async-failed=3
|
||||
## topic ????
|
||||
|
||||
mq.topic.info=info
|
||||
mq.topic.eightWork=eightWork
|
||||
mq.group.info=scheduled_tasks
|
||||
mq.group.eightWork=scheduled_tasks_eightWork
|
||||
|
||||
# topic ????
|
||||
mq.topic.docking=docking
|
||||
mq.topic.dockingPicture=dockingPicture
|
||||
mq.group.docking=scheduled_tasks_docking
|
||||
|
||||
#???? ??????
|
||||
perLoc.url=http://172.16.130.86/gateway-service
|
||||
perLoc.userName=qaaqadmin
|
||||
perLoc.pwd=Cfd2023@
|
||||
|
||||
#????? ??????
|
||||
corp.default.pic-path=https://qgqy.qhdsafety.com/
|
||||
corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
|
||||
|
||||
#??????
|
||||
http.file.url=http://172.16.130.91:9004/file/
|
||||
#??????
|
||||
baseimgpath =http://172.16.130.91:9004/file/
|
||||
cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd
|
||||
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
|
||||
spring.redis.database=0
|
||||
# Redis\u670D\u52A1\u5668\u5730\u5740
|
||||
spring.redis.host=127.0.0.1
|
||||
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
|
||||
spring.redis.port=6379
|
||||
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
|
||||
spring.redis.password=
|
||||
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
|
||||
spring.redis.jedis.pool.max-active=20
|
||||
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
|
||||
spring.redis.jedis.pool.max-wait=-1
|
||||
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
|
||||
spring.redis.jedis.pool.max-idle=10
|
||||
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
|
||||
spring.redis.jedis.pool.min-idle=0
|
||||
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
|
||||
spring.redis.timeout=1000
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
spring.application.name=qa-prevention-cmt
|
||||
server.port=8091
|
||||
|
||||
spring.profiles.active= @spring.profiles.active@
|
||||
spring.profiles.active= master
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue