Commit 8a5b5b8f authored by 赵啸非's avatar 赵啸非

添加照片海康下载

parent 4bdd7bcc
...@@ -13,8 +13,7 @@ import com.mortals.framework.model.Result; ...@@ -13,8 +13,7 @@ import com.mortals.framework.model.Result;
import com.mortals.xhx.busiz.h5.req.AppealReq; import com.mortals.xhx.busiz.h5.req.AppealReq;
import com.mortals.xhx.busiz.h5.req.PerformReq; import com.mortals.xhx.busiz.h5.req.PerformReq;
import com.mortals.xhx.busiz.h5.rsp.AppealStatInfo; import com.mortals.xhx.busiz.h5.rsp.AppealStatInfo;
import com.mortals.xhx.common.code.PerformTypeEnum; import com.mortals.xhx.common.code.*;
import com.mortals.xhx.common.code.ProcessStatusEnum;
import com.mortals.xhx.common.utils.BeanUtil; import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.check.model.*; import com.mortals.xhx.module.check.model.*;
import com.mortals.xhx.module.check.service.*; import com.mortals.xhx.module.check.service.*;
...@@ -66,6 +65,12 @@ public class AppealApiController extends AbstractBaseController<PerformReq> { ...@@ -66,6 +65,12 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
@Autowired @Autowired
private PerformAttendAppealService appealService; private PerformAttendAppealService appealService;
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
}
/** /**
* 个人申诉绩效统计 * 个人申诉绩效统计
...@@ -131,7 +136,7 @@ public class AppealApiController extends AbstractBaseController<PerformReq> { ...@@ -131,7 +136,7 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
parsePageInfo(model, result.getPageInfo()); parsePageInfo(model, result.getPageInfo());
rest.setData(model); rest.setData(model);
this.init(model, context);
recordSysLog(request, busiDesc + " 【成功】"); recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
...@@ -150,13 +155,15 @@ public class AppealApiController extends AbstractBaseController<PerformReq> { ...@@ -150,13 +155,15 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(appealReq)); log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(appealReq));
Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】"); Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
Context context = this.getContext(); Context context = this.getContext();
Map<String, Object> model = new HashMap<>();
try { try {
if (ObjectUtils.isEmpty(appealReq.getId())) { if (ObjectUtils.isEmpty(appealReq.getId())) {
throw new AppException("详细查询id不能为空!"); throw new AppException("详细查询id不能为空!");
} }
PerformAttendAppealEntity performAttendAppealEntity = appealService.get(appealReq.getId(), context); PerformAttendAppealEntity performAttendAppealEntity = appealService.get(appealReq.getId(), context);
rest.setData(performAttendAppealEntity); rest.setData(performAttendAppealEntity);
this.init(model, context);
rest.setDict(model.get("dict"));
recordSysLog(request, busiDesc + " 【成功】"); recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
......
...@@ -13,9 +13,7 @@ import com.mortals.xhx.busiz.h5.req.PerformReq; ...@@ -13,9 +13,7 @@ import com.mortals.xhx.busiz.h5.req.PerformReq;
import com.mortals.xhx.busiz.h5.rsp.InspectStatInfo; import com.mortals.xhx.busiz.h5.rsp.InspectStatInfo;
import com.mortals.xhx.busiz.h5.rsp.PerformDetailInfo; import com.mortals.xhx.busiz.h5.rsp.PerformDetailInfo;
import com.mortals.xhx.busiz.h5.rsp.PerformInfo; import com.mortals.xhx.busiz.h5.rsp.PerformInfo;
import com.mortals.xhx.common.code.PerformTypeEnum; import com.mortals.xhx.common.code.*;
import com.mortals.xhx.common.code.SubAddTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.utils.BeanUtil; import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.check.dao.CheckAllRecordDao; import com.mortals.xhx.module.check.dao.CheckAllRecordDao;
import com.mortals.xhx.module.check.model.*; import com.mortals.xhx.module.check.model.*;
...@@ -91,6 +89,13 @@ public class InspectApiController extends AbstractBaseController<PerformReq> { ...@@ -91,6 +89,13 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
private CheckAllRecordDao checkAllRecordDao; private CheckAllRecordDao checkAllRecordDao;
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
}
/** /**
* 个人巡查效统计 * 个人巡查效统计
*/ */
...@@ -199,6 +204,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> { ...@@ -199,6 +204,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
parsePageInfo(model, result.getPageInfo()); parsePageInfo(model, result.getPageInfo());
} }
rest.setData(model); rest.setData(model);
this.init(model, context);
recordSysLog(request, busiDesc + " 【成功】"); recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
...@@ -453,6 +459,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> { ...@@ -453,6 +459,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
@PostMapping(value = "info") @PostMapping(value = "info")
public Rest<PerformDetailInfo> performInfo(@RequestBody PerformReq performReq) { public Rest<PerformDetailInfo> performInfo(@RequestBody PerformReq performReq) {
Context context = this.getContext(); Context context = this.getContext();
Map<String, Object> model = new HashMap<>();
String busiDesc = "个人巡查详细"; String busiDesc = "个人巡查详细";
log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(performReq)); log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(performReq));
Rest<PerformDetailInfo> rest = Rest.ok(busiDesc + " 【成功】"); Rest<PerformDetailInfo> rest = Rest.ok(busiDesc + " 【成功】");
...@@ -489,6 +496,10 @@ public class InspectApiController extends AbstractBaseController<PerformReq> { ...@@ -489,6 +496,10 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
log.error(busiDesc, e); log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e)); rest = Rest.fail(super.convertException(e));
} }
this.init(model, context);
rest.setDict(model.get("dict"));
return rest; return rest;
} }
......
...@@ -83,6 +83,14 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -83,6 +83,14 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
@Autowired @Autowired
private PerformRulesService rulesService; private PerformRulesService rulesService;
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
}
/** /**
* 个人当天绩效统计 * 个人当天绩效统计
*/ */
...@@ -343,6 +351,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -343,6 +351,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
log.error(busiDesc, e); log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e)); rest = Rest.fail(super.convertException(e));
} }
this.init(model, context);
return rest; return rest;
} }
...@@ -369,6 +379,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -369,6 +379,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
@PostMapping(value = "info") @PostMapping(value = "info")
public Rest<PerformDetailInfo> performInfo(@RequestBody PerformReq performReq) { public Rest<PerformDetailInfo> performInfo(@RequestBody PerformReq performReq) {
Context context = this.getContext(); Context context = this.getContext();
Map<String, Object> model = new HashMap<>();
String busiDesc = "个人绩效增减详细"; String busiDesc = "个人绩效增减详细";
log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(performReq)); log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(performReq));
Rest<PerformDetailInfo> rest = Rest.ok(busiDesc + " 【成功】"); Rest<PerformDetailInfo> rest = Rest.ok(busiDesc + " 【成功】");
...@@ -419,10 +430,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -419,10 +430,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performDetailInfo.setRuleDesc(rulesEntity.getContent()); performDetailInfo.setRuleDesc(rulesEntity.getContent());
rest.setData(performDetailInfo); rest.setData(performDetailInfo);
log.info("rspperformDetailInfo:{}", JSON.toJSONString(performDetailInfo)); log.info("rspperformDetailInfo:{}", JSON.toJSONString(performDetailInfo));
this.init(model, context);
rest.setDict(model.get("dict"));
recordSysLog(request, busiDesc + " 【成功】"); recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment