diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java index 4cad5da..a7d496e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java @@ -48,7 +48,7 @@ /** * 安全生产更新 */ - @RequestMapping(value = "/status") + @RequestMapping(value = "/sign-status") public Object getTodaySignStatus(String openId) { Assert.isFalse(StringUtils.isEmpty(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); @@ -75,6 +75,7 @@ */ @RequestMapping(value = "/add") public Object add(@RequestBody @Valid AppProductSafe appProductSafe, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); @@ -82,6 +83,17 @@ } /** + * 安全生产责任书当天详情 + */ + @RequestMapping(value = "/today-detail") + public Object todayDetail(String openId) { + Assert.isFalse(StringUtils.isEmpty(openId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return proucteSafeService.todayDetail(openId); + } + + /** * 安全生产详情信息 */ @RequestMapping(value = "/detail") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java index 4cad5da..a7d496e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java @@ -48,7 +48,7 @@ /** * 安全生产更新 */ - @RequestMapping(value = "/status") + @RequestMapping(value = "/sign-status") public Object getTodaySignStatus(String openId) { Assert.isFalse(StringUtils.isEmpty(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); @@ -75,6 +75,7 @@ */ @RequestMapping(value = "/add") public Object add(@RequestBody @Valid AppProductSafe appProductSafe, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); @@ -82,6 +83,17 @@ } /** + * 安全生产责任书当天详情 + */ + @RequestMapping(value = "/today-detail") + public Object todayDetail(String openId) { + Assert.isFalse(StringUtils.isEmpty(openId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return proucteSafeService.todayDetail(openId); + } + + /** * 安全生产详情信息 */ @RequestMapping(value = "/detail") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 177f387..613f042 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -31,6 +32,7 @@ * @Date 2020-05-24 11:21:45 */ @Controller +@Slf4j @RequestMapping("/appUserOpenid") public class AppUserOpenidController extends BaseController { @@ -83,6 +85,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json + log.info("----------"+res.toJSONString() ); openid = res.get("openid").toString(); //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java index 4cad5da..a7d496e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java @@ -48,7 +48,7 @@ /** * 安全生产更新 */ - @RequestMapping(value = "/status") + @RequestMapping(value = "/sign-status") public Object getTodaySignStatus(String openId) { Assert.isFalse(StringUtils.isEmpty(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); @@ -75,6 +75,7 @@ */ @RequestMapping(value = "/add") public Object add(@RequestBody @Valid AppProductSafe appProductSafe, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); @@ -82,6 +83,17 @@ } /** + * 安全生产责任书当天详情 + */ + @RequestMapping(value = "/today-detail") + public Object todayDetail(String openId) { + Assert.isFalse(StringUtils.isEmpty(openId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return proucteSafeService.todayDetail(openId); + } + + /** * 安全生产详情信息 */ @RequestMapping(value = "/detail") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 177f387..613f042 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -31,6 +32,7 @@ * @Date 2020-05-24 11:21:45 */ @Controller +@Slf4j @RequestMapping("/appUserOpenid") public class AppUserOpenidController extends BaseController { @@ -83,6 +85,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json + log.info("----------"+res.toJSONString() ); openid = res.get("openid").toString(); //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java index 27e9adb..40ea6a7 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -6,6 +6,6 @@ public interface AppProductSafeMapper extends BaseMapper { - String getTodaySignStatus(@Param("openId") String openId); + AppProductSafe getTodaySignStatus(@Param("openId") String openId); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java index 4cad5da..a7d496e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java @@ -48,7 +48,7 @@ /** * 安全生产更新 */ - @RequestMapping(value = "/status") + @RequestMapping(value = "/sign-status") public Object getTodaySignStatus(String openId) { Assert.isFalse(StringUtils.isEmpty(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); @@ -75,6 +75,7 @@ */ @RequestMapping(value = "/add") public Object add(@RequestBody @Valid AppProductSafe appProductSafe, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); @@ -82,6 +83,17 @@ } /** + * 安全生产责任书当天详情 + */ + @RequestMapping(value = "/today-detail") + public Object todayDetail(String openId) { + Assert.isFalse(StringUtils.isEmpty(openId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return proucteSafeService.todayDetail(openId); + } + + /** * 安全生产详情信息 */ @RequestMapping(value = "/detail") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 177f387..613f042 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -31,6 +32,7 @@ * @Date 2020-05-24 11:21:45 */ @Controller +@Slf4j @RequestMapping("/appUserOpenid") public class AppUserOpenidController extends BaseController { @@ -83,6 +85,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json + log.info("----------"+res.toJSONString() ); openid = res.get("openid").toString(); //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java index 27e9adb..40ea6a7 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -6,6 +6,6 @@ public interface AppProductSafeMapper extends BaseMapper { - String getTodaySignStatus(@Param("openId") String openId); + AppProductSafe getTodaySignStatus(@Param("openId") String openId); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml index 7e09d77..5f28602 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -32,7 +32,7 @@ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java index 4cad5da..a7d496e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java @@ -48,7 +48,7 @@ /** * 安全生产更新 */ - @RequestMapping(value = "/status") + @RequestMapping(value = "/sign-status") public Object getTodaySignStatus(String openId) { Assert.isFalse(StringUtils.isEmpty(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); @@ -75,6 +75,7 @@ */ @RequestMapping(value = "/add") public Object add(@RequestBody @Valid AppProductSafe appProductSafe, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); @@ -82,6 +83,17 @@ } /** + * 安全生产责任书当天详情 + */ + @RequestMapping(value = "/today-detail") + public Object todayDetail(String openId) { + Assert.isFalse(StringUtils.isEmpty(openId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return proucteSafeService.todayDetail(openId); + } + + /** * 安全生产详情信息 */ @RequestMapping(value = "/detail") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 177f387..613f042 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -31,6 +32,7 @@ * @Date 2020-05-24 11:21:45 */ @Controller +@Slf4j @RequestMapping("/appUserOpenid") public class AppUserOpenidController extends BaseController { @@ -83,6 +85,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json + log.info("----------"+res.toJSONString() ); openid = res.get("openid").toString(); //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java index 27e9adb..40ea6a7 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -6,6 +6,6 @@ public interface AppProductSafeMapper extends BaseMapper { - String getTodaySignStatus(@Param("openId") String openId); + AppProductSafe getTodaySignStatus(@Param("openId") String openId); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml index 7e09d77..5f28602 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -32,7 +32,7 @@ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml index 338b3ab..1b19fa1 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml @@ -2,20 +2,22 @@ - + SELECT * FROM ( - SELECT signName + SELECT * FROM app_product_safe where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59') + limit 1 ) aps JOIN ( SELECT name FROM app_user - WHERE openId=#{openId} AND STATUS="2" + WHERE openId=#{openId} AND STATUS="1" )au ON au.name=aps.signName + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java index 4cad5da..a7d496e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java @@ -48,7 +48,7 @@ /** * 安全生产更新 */ - @RequestMapping(value = "/status") + @RequestMapping(value = "/sign-status") public Object getTodaySignStatus(String openId) { Assert.isFalse(StringUtils.isEmpty(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); @@ -75,6 +75,7 @@ */ @RequestMapping(value = "/add") public Object add(@RequestBody @Valid AppProductSafe appProductSafe, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); @@ -82,6 +83,17 @@ } /** + * 安全生产责任书当天详情 + */ + @RequestMapping(value = "/today-detail") + public Object todayDetail(String openId) { + Assert.isFalse(StringUtils.isEmpty(openId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return proucteSafeService.todayDetail(openId); + } + + /** * 安全生产详情信息 */ @RequestMapping(value = "/detail") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 177f387..613f042 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -31,6 +32,7 @@ * @Date 2020-05-24 11:21:45 */ @Controller +@Slf4j @RequestMapping("/appUserOpenid") public class AppUserOpenidController extends BaseController { @@ -83,6 +85,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json + log.info("----------"+res.toJSONString() ); openid = res.get("openid").toString(); //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java index 27e9adb..40ea6a7 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -6,6 +6,6 @@ public interface AppProductSafeMapper extends BaseMapper { - String getTodaySignStatus(@Param("openId") String openId); + AppProductSafe getTodaySignStatus(@Param("openId") String openId); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml index 7e09d77..5f28602 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -32,7 +32,7 @@ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml index 338b3ab..1b19fa1 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml @@ -2,20 +2,22 @@ - + SELECT * FROM ( - SELECT signName + SELECT * FROM app_product_safe where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59') + limit 1 ) aps JOIN ( SELECT name FROM app_user - WHERE openId=#{openId} AND STATUS="2" + WHERE openId=#{openId} AND STATUS="1" )au ON au.name=aps.signName + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java index ee8428f..af609c5 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -17,6 +17,8 @@ private Long projectId; @TableField(exist = false) private String projectName; + @TableField(exist = false) + private String openId; private String signImage; private String signName; private Date signTime; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java index 4cad5da..a7d496e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java @@ -48,7 +48,7 @@ /** * 安全生产更新 */ - @RequestMapping(value = "/status") + @RequestMapping(value = "/sign-status") public Object getTodaySignStatus(String openId) { Assert.isFalse(StringUtils.isEmpty(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); @@ -75,6 +75,7 @@ */ @RequestMapping(value = "/add") public Object add(@RequestBody @Valid AppProductSafe appProductSafe, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); @@ -82,6 +83,17 @@ } /** + * 安全生产责任书当天详情 + */ + @RequestMapping(value = "/today-detail") + public Object todayDetail(String openId) { + Assert.isFalse(StringUtils.isEmpty(openId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return proucteSafeService.todayDetail(openId); + } + + /** * 安全生产详情信息 */ @RequestMapping(value = "/detail") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 177f387..613f042 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -31,6 +32,7 @@ * @Date 2020-05-24 11:21:45 */ @Controller +@Slf4j @RequestMapping("/appUserOpenid") public class AppUserOpenidController extends BaseController { @@ -83,6 +85,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json + log.info("----------"+res.toJSONString() ); openid = res.get("openid").toString(); //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java index 27e9adb..40ea6a7 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -6,6 +6,6 @@ public interface AppProductSafeMapper extends BaseMapper { - String getTodaySignStatus(@Param("openId") String openId); + AppProductSafe getTodaySignStatus(@Param("openId") String openId); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml index 7e09d77..5f28602 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -32,7 +32,7 @@ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml index 338b3ab..1b19fa1 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml @@ -2,20 +2,22 @@ - + SELECT * FROM ( - SELECT signName + SELECT * FROM app_product_safe where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59') + limit 1 ) aps JOIN ( SELECT name FROM app_user - WHERE openId=#{openId} AND STATUS="2" + WHERE openId=#{openId} AND STATUS="1" )au ON au.name=aps.signName + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java index ee8428f..af609c5 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -17,6 +17,8 @@ private Long projectId; @TableField(exist = false) private String projectName; + @TableField(exist = false) + private String openId; private String signImage; private String signName; private Date signTime; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java index 159cff0..f5b769f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java @@ -12,11 +12,17 @@ Page listPage(Page page, ProucteSafeDTO proucteSafeDTO ); /** - * 安全生产更新 + * 安全生产最新状态 */ Object getTodaySignStatus(String openId); /** + * 安全生产当天的签名信息 + */ + Object todayDetail(String openId); + + + /** * 安全生产更新 */ Object update(AppProductSafe appProducteSafe); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java index 4cad5da..a7d496e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java @@ -48,7 +48,7 @@ /** * 安全生产更新 */ - @RequestMapping(value = "/status") + @RequestMapping(value = "/sign-status") public Object getTodaySignStatus(String openId) { Assert.isFalse(StringUtils.isEmpty(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); @@ -75,6 +75,7 @@ */ @RequestMapping(value = "/add") public Object add(@RequestBody @Valid AppProductSafe appProductSafe, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); @@ -82,6 +83,17 @@ } /** + * 安全生产责任书当天详情 + */ + @RequestMapping(value = "/today-detail") + public Object todayDetail(String openId) { + Assert.isFalse(StringUtils.isEmpty(openId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return proucteSafeService.todayDetail(openId); + } + + /** * 安全生产详情信息 */ @RequestMapping(value = "/detail") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 177f387..613f042 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -31,6 +32,7 @@ * @Date 2020-05-24 11:21:45 */ @Controller +@Slf4j @RequestMapping("/appUserOpenid") public class AppUserOpenidController extends BaseController { @@ -83,6 +85,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json + log.info("----------"+res.toJSONString() ); openid = res.get("openid").toString(); //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java index 27e9adb..40ea6a7 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -6,6 +6,6 @@ public interface AppProductSafeMapper extends BaseMapper { - String getTodaySignStatus(@Param("openId") String openId); + AppProductSafe getTodaySignStatus(@Param("openId") String openId); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml index 7e09d77..5f28602 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -32,7 +32,7 @@ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml index 338b3ab..1b19fa1 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml @@ -2,20 +2,22 @@ - + SELECT * FROM ( - SELECT signName + SELECT * FROM app_product_safe where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59') + limit 1 ) aps JOIN ( SELECT name FROM app_user - WHERE openId=#{openId} AND STATUS="2" + WHERE openId=#{openId} AND STATUS="1" )au ON au.name=aps.signName + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java index ee8428f..af609c5 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -17,6 +17,8 @@ private Long projectId; @TableField(exist = false) private String projectName; + @TableField(exist = false) + private String openId; private String signImage; private String signName; private Date signTime; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java index 159cff0..f5b769f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java @@ -12,11 +12,17 @@ Page listPage(Page page, ProucteSafeDTO proucteSafeDTO ); /** - * 安全生产更新 + * 安全生产最新状态 */ Object getTodaySignStatus(String openId); /** + * 安全生产当天的签名信息 + */ + Object todayDetail(String openId); + + + /** * 安全生产更新 */ Object update(AppProductSafe appProducteSafe); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 2cafc39..3bdd529 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -22,9 +22,10 @@ Object resetPassword(AppUserSaveDTO appUserDTO); - Object project(String openId); + AppUser detail(String openId); + Object unbind(Long id); List batchImport(List results); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java index 4cad5da..a7d496e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java @@ -48,7 +48,7 @@ /** * 安全生产更新 */ - @RequestMapping(value = "/status") + @RequestMapping(value = "/sign-status") public Object getTodaySignStatus(String openId) { Assert.isFalse(StringUtils.isEmpty(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); @@ -75,6 +75,7 @@ */ @RequestMapping(value = "/add") public Object add(@RequestBody @Valid AppProductSafe appProductSafe, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); @@ -82,6 +83,17 @@ } /** + * 安全生产责任书当天详情 + */ + @RequestMapping(value = "/today-detail") + public Object todayDetail(String openId) { + Assert.isFalse(StringUtils.isEmpty(openId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return proucteSafeService.todayDetail(openId); + } + + /** * 安全生产详情信息 */ @RequestMapping(value = "/detail") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 177f387..613f042 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -31,6 +32,7 @@ * @Date 2020-05-24 11:21:45 */ @Controller +@Slf4j @RequestMapping("/appUserOpenid") public class AppUserOpenidController extends BaseController { @@ -83,6 +85,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json + log.info("----------"+res.toJSONString() ); openid = res.get("openid").toString(); //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java index 27e9adb..40ea6a7 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -6,6 +6,6 @@ public interface AppProductSafeMapper extends BaseMapper { - String getTodaySignStatus(@Param("openId") String openId); + AppProductSafe getTodaySignStatus(@Param("openId") String openId); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml index 7e09d77..5f28602 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -32,7 +32,7 @@ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml index 338b3ab..1b19fa1 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml @@ -2,20 +2,22 @@ - + SELECT * FROM ( - SELECT signName + SELECT * FROM app_product_safe where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59') + limit 1 ) aps JOIN ( SELECT name FROM app_user - WHERE openId=#{openId} AND STATUS="2" + WHERE openId=#{openId} AND STATUS="1" )au ON au.name=aps.signName + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java index ee8428f..af609c5 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -17,6 +17,8 @@ private Long projectId; @TableField(exist = false) private String projectName; + @TableField(exist = false) + private String openId; private String signImage; private String signName; private Date signTime; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java index 159cff0..f5b769f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java @@ -12,11 +12,17 @@ Page listPage(Page page, ProucteSafeDTO proucteSafeDTO ); /** - * 安全生产更新 + * 安全生产最新状态 */ Object getTodaySignStatus(String openId); /** + * 安全生产当天的签名信息 + */ + Object todayDetail(String openId); + + + /** * 安全生产更新 */ Object update(AppProductSafe appProducteSafe); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 2cafc39..3bdd529 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -22,9 +22,10 @@ Object resetPassword(AppUserSaveDTO appUserDTO); - Object project(String openId); + AppUser detail(String openId); + Object unbind(Long id); List batchImport(List results); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java index 236b987..1f03dfe 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java @@ -10,13 +10,17 @@ import com.casic.missiles.modular.app.enums.BusinessException; import com.casic.missiles.modular.app.enums.BusinessExceptionEnum; import com.casic.missiles.modular.app.model.AppProductSafe; +import com.casic.missiles.modular.app.model.AppUser; import com.casic.missiles.modular.app.service.IAppProductSafeService; +import com.casic.missiles.modular.app.service.IAppUserService; import com.casic.missiles.modular.app.service.IAppWellPreService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; +import java.io.File; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,6 +35,8 @@ private String photoPath; @Autowired private IAppWellPreService appWellPreService; + @Autowired + private IAppUserService appUserService; @Override public Page listPage(Page page, ProucteSafeDTO proucteSafeDTO) { @@ -51,9 +57,9 @@ @Override public Object getTodaySignStatus(String openId) { - String isHasSign = this.baseMapper.getTodaySignStatus(openId); + AppProductSafe appProductSafe = this.baseMapper.getTodaySignStatus(openId); Map signStatusMap = new HashMap<>(); - if (StringUtils.isEmpty(isHasSign)) { + if (ObjectUtils.isEmpty(appProductSafe)) { signStatusMap.put("signStatus", "0"); } else { signStatusMap.put("signStatus", "1"); @@ -62,7 +68,25 @@ } @Override + public Object todayDetail(String openId) { + AppProductSafe appProductSafe = this.baseMapper.getTodaySignStatus(openId); + if (StringUtils.isNotEmpty(photoPath)&&appProductSafe!=null) { + appProductSafe.setSignImage( + ToolUtil.isNotEmpty(appProductSafe.getSignImage()) ? photoPath + appProductSafe.getSignImage() : appProductSafe.getSignImage() + ); + } + return ResponseData.success(appProductSafe); + } + + @Override public Object update(AppProductSafe appProductSafe) { + if(!appProductSafe.getSignImage().contains("//")){ + if(appProductSafe.getSignImage().contains("/")){ + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("/","//")); + }else { + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("\\","//")); + } + } int updateFlag = this.baseMapper.updateById(appProductSafe); if (updateFlag > 0) { return ResponseData.success(); @@ -72,6 +96,15 @@ @Override public Object add(AppProductSafe appProductSafe) { + AppUser appUser =appUserService.detail(appProductSafe.getOpenId()); + if(!appProductSafe.getSignImage().contains("//")){ + if(appProductSafe.getSignImage().contains("/")){ + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("/","//")); + }else { + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("\\","//")); + } + } + appProductSafe.setSignName(appUser.getName()); int addFlag = this.baseMapper.insert(appProductSafe); if (addFlag > 0) { return ResponseData.success(); @@ -90,6 +123,10 @@ ToolUtil.isNotEmpty(appProductSafe.getSignImage()) ? photoPath + appProductSafe.getSignImage() : appProductSafe.getSignImage() ); } + Map appWellPreMap = appWellPreService.getProjestIdMap(); + if (!ObjectUtils.isEmpty(appProductSafe.getProjectId())) { + appProductSafe.setProjectName(appWellPreMap.get(appProductSafe.getProjectId().toString())); + } return appProductSafe; } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java index 4cad5da..a7d496e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java @@ -48,7 +48,7 @@ /** * 安全生产更新 */ - @RequestMapping(value = "/status") + @RequestMapping(value = "/sign-status") public Object getTodaySignStatus(String openId) { Assert.isFalse(StringUtils.isEmpty(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); @@ -75,6 +75,7 @@ */ @RequestMapping(value = "/add") public Object add(@RequestBody @Valid AppProductSafe appProductSafe, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); @@ -82,6 +83,17 @@ } /** + * 安全生产责任书当天详情 + */ + @RequestMapping(value = "/today-detail") + public Object todayDetail(String openId) { + Assert.isFalse(StringUtils.isEmpty(openId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return proucteSafeService.todayDetail(openId); + } + + /** * 安全生产详情信息 */ @RequestMapping(value = "/detail") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 177f387..613f042 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -31,6 +32,7 @@ * @Date 2020-05-24 11:21:45 */ @Controller +@Slf4j @RequestMapping("/appUserOpenid") public class AppUserOpenidController extends BaseController { @@ -83,6 +85,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json + log.info("----------"+res.toJSONString() ); openid = res.get("openid").toString(); //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java index 27e9adb..40ea6a7 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -6,6 +6,6 @@ public interface AppProductSafeMapper extends BaseMapper { - String getTodaySignStatus(@Param("openId") String openId); + AppProductSafe getTodaySignStatus(@Param("openId") String openId); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml index 7e09d77..5f28602 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -32,7 +32,7 @@ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml index 338b3ab..1b19fa1 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml @@ -2,20 +2,22 @@ - + SELECT * FROM ( - SELECT signName + SELECT * FROM app_product_safe where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59') + limit 1 ) aps JOIN ( SELECT name FROM app_user - WHERE openId=#{openId} AND STATUS="2" + WHERE openId=#{openId} AND STATUS="1" )au ON au.name=aps.signName + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java index ee8428f..af609c5 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -17,6 +17,8 @@ private Long projectId; @TableField(exist = false) private String projectName; + @TableField(exist = false) + private String openId; private String signImage; private String signName; private Date signTime; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java index 159cff0..f5b769f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java @@ -12,11 +12,17 @@ Page listPage(Page page, ProucteSafeDTO proucteSafeDTO ); /** - * 安全生产更新 + * 安全生产最新状态 */ Object getTodaySignStatus(String openId); /** + * 安全生产当天的签名信息 + */ + Object todayDetail(String openId); + + + /** * 安全生产更新 */ Object update(AppProductSafe appProducteSafe); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 2cafc39..3bdd529 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -22,9 +22,10 @@ Object resetPassword(AppUserSaveDTO appUserDTO); - Object project(String openId); + AppUser detail(String openId); + Object unbind(Long id); List batchImport(List results); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java index 236b987..1f03dfe 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java @@ -10,13 +10,17 @@ import com.casic.missiles.modular.app.enums.BusinessException; import com.casic.missiles.modular.app.enums.BusinessExceptionEnum; import com.casic.missiles.modular.app.model.AppProductSafe; +import com.casic.missiles.modular.app.model.AppUser; import com.casic.missiles.modular.app.service.IAppProductSafeService; +import com.casic.missiles.modular.app.service.IAppUserService; import com.casic.missiles.modular.app.service.IAppWellPreService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; +import java.io.File; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,6 +35,8 @@ private String photoPath; @Autowired private IAppWellPreService appWellPreService; + @Autowired + private IAppUserService appUserService; @Override public Page listPage(Page page, ProucteSafeDTO proucteSafeDTO) { @@ -51,9 +57,9 @@ @Override public Object getTodaySignStatus(String openId) { - String isHasSign = this.baseMapper.getTodaySignStatus(openId); + AppProductSafe appProductSafe = this.baseMapper.getTodaySignStatus(openId); Map signStatusMap = new HashMap<>(); - if (StringUtils.isEmpty(isHasSign)) { + if (ObjectUtils.isEmpty(appProductSafe)) { signStatusMap.put("signStatus", "0"); } else { signStatusMap.put("signStatus", "1"); @@ -62,7 +68,25 @@ } @Override + public Object todayDetail(String openId) { + AppProductSafe appProductSafe = this.baseMapper.getTodaySignStatus(openId); + if (StringUtils.isNotEmpty(photoPath)&&appProductSafe!=null) { + appProductSafe.setSignImage( + ToolUtil.isNotEmpty(appProductSafe.getSignImage()) ? photoPath + appProductSafe.getSignImage() : appProductSafe.getSignImage() + ); + } + return ResponseData.success(appProductSafe); + } + + @Override public Object update(AppProductSafe appProductSafe) { + if(!appProductSafe.getSignImage().contains("//")){ + if(appProductSafe.getSignImage().contains("/")){ + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("/","//")); + }else { + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("\\","//")); + } + } int updateFlag = this.baseMapper.updateById(appProductSafe); if (updateFlag > 0) { return ResponseData.success(); @@ -72,6 +96,15 @@ @Override public Object add(AppProductSafe appProductSafe) { + AppUser appUser =appUserService.detail(appProductSafe.getOpenId()); + if(!appProductSafe.getSignImage().contains("//")){ + if(appProductSafe.getSignImage().contains("/")){ + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("/","//")); + }else { + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("\\","//")); + } + } + appProductSafe.setSignName(appUser.getName()); int addFlag = this.baseMapper.insert(appProductSafe); if (addFlag > 0) { return ResponseData.success(); @@ -90,6 +123,10 @@ ToolUtil.isNotEmpty(appProductSafe.getSignImage()) ? photoPath + appProductSafe.getSignImage() : appProductSafe.getSignImage() ); } + Map appWellPreMap = appWellPreService.getProjestIdMap(); + if (!ObjectUtils.isEmpty(appProductSafe.getProjectId())) { + appProductSafe.setProjectName(appWellPreMap.get(appProductSafe.getProjectId().toString())); + } return appProductSafe; } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java index 005f5cd..0b63971 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java @@ -160,13 +160,26 @@ Optional appUserOptional = appUserList.stream().findFirst(); if (appUserOptional.isPresent()) { AppUser appUser = appUserOptional.get(); - List> projects = tranIdsToListNames(appUser.getProjectIds()); + List> projects = tranIdsToListNames(appUser.getProjectIds()); return ResponseData.success(projects); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + public AppUser detail(String openId) { + EntityWrapper appUserWrapper = new EntityWrapper(); + appUserWrapper.eq("openId", openId); + List appUserList = this.baseMapper.selectList(appUserWrapper); + Optional appUserOptional = appUserList.stream().findFirst(); + if (appUserOptional.isPresent()) { + AppUser appUser = appUserOptional.get(); + return appUser; + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override public Object unbind(Long id) { AppUser appUser = new AppUser(); appUser.setId(id); @@ -320,15 +333,15 @@ /** * 通过项目ids获取项目名称列表 */ - private List> tranIdsToListNames(String projectIds) { + private List> tranIdsToListNames(String projectIds) { Map wellPreMaps = appWellPreService.getProjestIdMap(); - List> projectNamelist = new ArrayList<>(); + List> projectNamelist = new ArrayList<>(); String[] projectIdStrs = projectIds.split(","); for (String projectId : projectIdStrs) { if (!StringUtils.isEmpty(projectId)) { - Map projectMap=new HashMap(); - projectMap.put("projectId",projectId); - projectMap.put("projectName",wellPreMaps.get(projectId)); + Map projectMap = new HashMap(); + projectMap.put("projectId", projectId); + projectMap.put("projectName", wellPreMaps.get(projectId)); projectNamelist.add(projectMap); } } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java index 4cad5da..a7d496e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java @@ -48,7 +48,7 @@ /** * 安全生产更新 */ - @RequestMapping(value = "/status") + @RequestMapping(value = "/sign-status") public Object getTodaySignStatus(String openId) { Assert.isFalse(StringUtils.isEmpty(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); @@ -75,6 +75,7 @@ */ @RequestMapping(value = "/add") public Object add(@RequestBody @Valid AppProductSafe appProductSafe, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); @@ -82,6 +83,17 @@ } /** + * 安全生产责任书当天详情 + */ + @RequestMapping(value = "/today-detail") + public Object todayDetail(String openId) { + Assert.isFalse(StringUtils.isEmpty(openId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return proucteSafeService.todayDetail(openId); + } + + /** * 安全生产详情信息 */ @RequestMapping(value = "/detail") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 177f387..613f042 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -31,6 +32,7 @@ * @Date 2020-05-24 11:21:45 */ @Controller +@Slf4j @RequestMapping("/appUserOpenid") public class AppUserOpenidController extends BaseController { @@ -83,6 +85,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json + log.info("----------"+res.toJSONString() ); openid = res.get("openid").toString(); //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java index 27e9adb..40ea6a7 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -6,6 +6,6 @@ public interface AppProductSafeMapper extends BaseMapper { - String getTodaySignStatus(@Param("openId") String openId); + AppProductSafe getTodaySignStatus(@Param("openId") String openId); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml index 7e09d77..5f28602 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -32,7 +32,7 @@ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml index 338b3ab..1b19fa1 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml @@ -2,20 +2,22 @@ - + SELECT * FROM ( - SELECT signName + SELECT * FROM app_product_safe where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59') + limit 1 ) aps JOIN ( SELECT name FROM app_user - WHERE openId=#{openId} AND STATUS="2" + WHERE openId=#{openId} AND STATUS="1" )au ON au.name=aps.signName + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java index ee8428f..af609c5 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -17,6 +17,8 @@ private Long projectId; @TableField(exist = false) private String projectName; + @TableField(exist = false) + private String openId; private String signImage; private String signName; private Date signTime; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java index 159cff0..f5b769f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java @@ -12,11 +12,17 @@ Page listPage(Page page, ProucteSafeDTO proucteSafeDTO ); /** - * 安全生产更新 + * 安全生产最新状态 */ Object getTodaySignStatus(String openId); /** + * 安全生产当天的签名信息 + */ + Object todayDetail(String openId); + + + /** * 安全生产更新 */ Object update(AppProductSafe appProducteSafe); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 2cafc39..3bdd529 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -22,9 +22,10 @@ Object resetPassword(AppUserSaveDTO appUserDTO); - Object project(String openId); + AppUser detail(String openId); + Object unbind(Long id); List batchImport(List results); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java index 236b987..1f03dfe 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java @@ -10,13 +10,17 @@ import com.casic.missiles.modular.app.enums.BusinessException; import com.casic.missiles.modular.app.enums.BusinessExceptionEnum; import com.casic.missiles.modular.app.model.AppProductSafe; +import com.casic.missiles.modular.app.model.AppUser; import com.casic.missiles.modular.app.service.IAppProductSafeService; +import com.casic.missiles.modular.app.service.IAppUserService; import com.casic.missiles.modular.app.service.IAppWellPreService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; +import java.io.File; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,6 +35,8 @@ private String photoPath; @Autowired private IAppWellPreService appWellPreService; + @Autowired + private IAppUserService appUserService; @Override public Page listPage(Page page, ProucteSafeDTO proucteSafeDTO) { @@ -51,9 +57,9 @@ @Override public Object getTodaySignStatus(String openId) { - String isHasSign = this.baseMapper.getTodaySignStatus(openId); + AppProductSafe appProductSafe = this.baseMapper.getTodaySignStatus(openId); Map signStatusMap = new HashMap<>(); - if (StringUtils.isEmpty(isHasSign)) { + if (ObjectUtils.isEmpty(appProductSafe)) { signStatusMap.put("signStatus", "0"); } else { signStatusMap.put("signStatus", "1"); @@ -62,7 +68,25 @@ } @Override + public Object todayDetail(String openId) { + AppProductSafe appProductSafe = this.baseMapper.getTodaySignStatus(openId); + if (StringUtils.isNotEmpty(photoPath)&&appProductSafe!=null) { + appProductSafe.setSignImage( + ToolUtil.isNotEmpty(appProductSafe.getSignImage()) ? photoPath + appProductSafe.getSignImage() : appProductSafe.getSignImage() + ); + } + return ResponseData.success(appProductSafe); + } + + @Override public Object update(AppProductSafe appProductSafe) { + if(!appProductSafe.getSignImage().contains("//")){ + if(appProductSafe.getSignImage().contains("/")){ + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("/","//")); + }else { + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("\\","//")); + } + } int updateFlag = this.baseMapper.updateById(appProductSafe); if (updateFlag > 0) { return ResponseData.success(); @@ -72,6 +96,15 @@ @Override public Object add(AppProductSafe appProductSafe) { + AppUser appUser =appUserService.detail(appProductSafe.getOpenId()); + if(!appProductSafe.getSignImage().contains("//")){ + if(appProductSafe.getSignImage().contains("/")){ + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("/","//")); + }else { + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("\\","//")); + } + } + appProductSafe.setSignName(appUser.getName()); int addFlag = this.baseMapper.insert(appProductSafe); if (addFlag > 0) { return ResponseData.success(); @@ -90,6 +123,10 @@ ToolUtil.isNotEmpty(appProductSafe.getSignImage()) ? photoPath + appProductSafe.getSignImage() : appProductSafe.getSignImage() ); } + Map appWellPreMap = appWellPreService.getProjestIdMap(); + if (!ObjectUtils.isEmpty(appProductSafe.getProjectId())) { + appProductSafe.setProjectName(appWellPreMap.get(appProductSafe.getProjectId().toString())); + } return appProductSafe; } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java index 005f5cd..0b63971 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java @@ -160,13 +160,26 @@ Optional appUserOptional = appUserList.stream().findFirst(); if (appUserOptional.isPresent()) { AppUser appUser = appUserOptional.get(); - List> projects = tranIdsToListNames(appUser.getProjectIds()); + List> projects = tranIdsToListNames(appUser.getProjectIds()); return ResponseData.success(projects); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + public AppUser detail(String openId) { + EntityWrapper appUserWrapper = new EntityWrapper(); + appUserWrapper.eq("openId", openId); + List appUserList = this.baseMapper.selectList(appUserWrapper); + Optional appUserOptional = appUserList.stream().findFirst(); + if (appUserOptional.isPresent()) { + AppUser appUser = appUserOptional.get(); + return appUser; + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override public Object unbind(Long id) { AppUser appUser = new AppUser(); appUser.setId(id); @@ -320,15 +333,15 @@ /** * 通过项目ids获取项目名称列表 */ - private List> tranIdsToListNames(String projectIds) { + private List> tranIdsToListNames(String projectIds) { Map wellPreMaps = appWellPreService.getProjestIdMap(); - List> projectNamelist = new ArrayList<>(); + List> projectNamelist = new ArrayList<>(); String[] projectIdStrs = projectIds.split(","); for (String projectId : projectIdStrs) { if (!StringUtils.isEmpty(projectId)) { - Map projectMap=new HashMap(); - projectMap.put("projectId",projectId); - projectMap.put("projectName",wellPreMaps.get(projectId)); + Map projectMap = new HashMap(); + projectMap.put("projectId", projectId); + projectMap.put("projectName", wellPreMaps.get(projectId)); projectNamelist.add(projectMap); } } diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 47a8b06..2e7e9a7 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -35,3 +35,4 @@ + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java index 4cad5da..a7d496e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProductSafeController.java @@ -48,7 +48,7 @@ /** * 安全生产更新 */ - @RequestMapping(value = "/status") + @RequestMapping(value = "/sign-status") public Object getTodaySignStatus(String openId) { Assert.isFalse(StringUtils.isEmpty(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); @@ -75,6 +75,7 @@ */ @RequestMapping(value = "/add") public Object add(@RequestBody @Valid AppProductSafe appProductSafe, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); @@ -82,6 +83,17 @@ } /** + * 安全生产责任书当天详情 + */ + @RequestMapping(value = "/today-detail") + public Object todayDetail(String openId) { + Assert.isFalse(StringUtils.isEmpty(openId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return proucteSafeService.todayDetail(openId); + } + + /** * 安全生产详情信息 */ @RequestMapping(value = "/detail") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 177f387..613f042 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -31,6 +32,7 @@ * @Date 2020-05-24 11:21:45 */ @Controller +@Slf4j @RequestMapping("/appUserOpenid") public class AppUserOpenidController extends BaseController { @@ -83,6 +85,7 @@ HttpEntity result = response.getEntity();//拿到返回的HttpResponse的"实体" String content = EntityUtils.toString(result); JSONObject res = JSONObject.parseObject(content);//把信息封装为json + log.info("----------"+res.toJSONString() ); openid = res.get("openid").toString(); //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java index 27e9adb..40ea6a7 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -6,6 +6,6 @@ public interface AppProductSafeMapper extends BaseMapper { - String getTodaySignStatus(@Param("openId") String openId); + AppProductSafe getTodaySignStatus(@Param("openId") String openId); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml index 7e09d77..5f28602 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -32,7 +32,7 @@ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml index 338b3ab..1b19fa1 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml @@ -2,20 +2,22 @@ - + SELECT * FROM ( - SELECT signName + SELECT * FROM app_product_safe where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59') + limit 1 ) aps JOIN ( SELECT name FROM app_user - WHERE openId=#{openId} AND STATUS="2" + WHERE openId=#{openId} AND STATUS="1" )au ON au.name=aps.signName + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java index ee8428f..af609c5 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -17,6 +17,8 @@ private Long projectId; @TableField(exist = false) private String projectName; + @TableField(exist = false) + private String openId; private String signImage; private String signName; private Date signTime; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java index 159cff0..f5b769f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProductSafeService.java @@ -12,11 +12,17 @@ Page listPage(Page page, ProucteSafeDTO proucteSafeDTO ); /** - * 安全生产更新 + * 安全生产最新状态 */ Object getTodaySignStatus(String openId); /** + * 安全生产当天的签名信息 + */ + Object todayDetail(String openId); + + + /** * 安全生产更新 */ Object update(AppProductSafe appProducteSafe); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 2cafc39..3bdd529 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -22,9 +22,10 @@ Object resetPassword(AppUserSaveDTO appUserDTO); - Object project(String openId); + AppUser detail(String openId); + Object unbind(Long id); List batchImport(List results); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java index 236b987..1f03dfe 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java @@ -10,13 +10,17 @@ import com.casic.missiles.modular.app.enums.BusinessException; import com.casic.missiles.modular.app.enums.BusinessExceptionEnum; import com.casic.missiles.modular.app.model.AppProductSafe; +import com.casic.missiles.modular.app.model.AppUser; import com.casic.missiles.modular.app.service.IAppProductSafeService; +import com.casic.missiles.modular.app.service.IAppUserService; import com.casic.missiles.modular.app.service.IAppWellPreService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; +import java.io.File; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,6 +35,8 @@ private String photoPath; @Autowired private IAppWellPreService appWellPreService; + @Autowired + private IAppUserService appUserService; @Override public Page listPage(Page page, ProucteSafeDTO proucteSafeDTO) { @@ -51,9 +57,9 @@ @Override public Object getTodaySignStatus(String openId) { - String isHasSign = this.baseMapper.getTodaySignStatus(openId); + AppProductSafe appProductSafe = this.baseMapper.getTodaySignStatus(openId); Map signStatusMap = new HashMap<>(); - if (StringUtils.isEmpty(isHasSign)) { + if (ObjectUtils.isEmpty(appProductSafe)) { signStatusMap.put("signStatus", "0"); } else { signStatusMap.put("signStatus", "1"); @@ -62,7 +68,25 @@ } @Override + public Object todayDetail(String openId) { + AppProductSafe appProductSafe = this.baseMapper.getTodaySignStatus(openId); + if (StringUtils.isNotEmpty(photoPath)&&appProductSafe!=null) { + appProductSafe.setSignImage( + ToolUtil.isNotEmpty(appProductSafe.getSignImage()) ? photoPath + appProductSafe.getSignImage() : appProductSafe.getSignImage() + ); + } + return ResponseData.success(appProductSafe); + } + + @Override public Object update(AppProductSafe appProductSafe) { + if(!appProductSafe.getSignImage().contains("//")){ + if(appProductSafe.getSignImage().contains("/")){ + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("/","//")); + }else { + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("\\","//")); + } + } int updateFlag = this.baseMapper.updateById(appProductSafe); if (updateFlag > 0) { return ResponseData.success(); @@ -72,6 +96,15 @@ @Override public Object add(AppProductSafe appProductSafe) { + AppUser appUser =appUserService.detail(appProductSafe.getOpenId()); + if(!appProductSafe.getSignImage().contains("//")){ + if(appProductSafe.getSignImage().contains("/")){ + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("/","//")); + }else { + appProductSafe.setSignImage(appProductSafe.getSignImage().replace("\\","//")); + } + } + appProductSafe.setSignName(appUser.getName()); int addFlag = this.baseMapper.insert(appProductSafe); if (addFlag > 0) { return ResponseData.success(); @@ -90,6 +123,10 @@ ToolUtil.isNotEmpty(appProductSafe.getSignImage()) ? photoPath + appProductSafe.getSignImage() : appProductSafe.getSignImage() ); } + Map appWellPreMap = appWellPreService.getProjestIdMap(); + if (!ObjectUtils.isEmpty(appProductSafe.getProjectId())) { + appProductSafe.setProjectName(appWellPreMap.get(appProductSafe.getProjectId().toString())); + } return appProductSafe; } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java index 005f5cd..0b63971 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java @@ -160,13 +160,26 @@ Optional appUserOptional = appUserList.stream().findFirst(); if (appUserOptional.isPresent()) { AppUser appUser = appUserOptional.get(); - List> projects = tranIdsToListNames(appUser.getProjectIds()); + List> projects = tranIdsToListNames(appUser.getProjectIds()); return ResponseData.success(projects); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + public AppUser detail(String openId) { + EntityWrapper appUserWrapper = new EntityWrapper(); + appUserWrapper.eq("openId", openId); + List appUserList = this.baseMapper.selectList(appUserWrapper); + Optional appUserOptional = appUserList.stream().findFirst(); + if (appUserOptional.isPresent()) { + AppUser appUser = appUserOptional.get(); + return appUser; + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override public Object unbind(Long id) { AppUser appUser = new AppUser(); appUser.setId(id); @@ -320,15 +333,15 @@ /** * 通过项目ids获取项目名称列表 */ - private List> tranIdsToListNames(String projectIds) { + private List> tranIdsToListNames(String projectIds) { Map wellPreMaps = appWellPreService.getProjestIdMap(); - List> projectNamelist = new ArrayList<>(); + List> projectNamelist = new ArrayList<>(); String[] projectIdStrs = projectIds.split(","); for (String projectId : projectIdStrs) { if (!StringUtils.isEmpty(projectId)) { - Map projectMap=new HashMap(); - projectMap.put("projectId",projectId); - projectMap.put("projectName",wellPreMaps.get(projectId)); + Map projectMap = new HashMap(); + projectMap.put("projectId", projectId); + projectMap.put("projectName", wellPreMaps.get(projectId)); projectNamelist.add(projectMap); } } diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 47a8b06..2e7e9a7 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -35,3 +35,4 @@ + diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 8b566be..8703f91 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -14,16 +14,16 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/appDeviceLog/listPage,/appDeviceAdd/add,/appDeviceLog/deviceDetail,/appDeviceLog/add,/appDeviceAdd/fileUpload,/appDeviceAdd/findListByCodes,/appDeviceAdd/findModeCodeByCode,/deviceType/getUser,/project/getProject,/appDeviceLog/deletePhoto,/deviceType/deviceType,/productRepairRecords/add,/appDeviceAdd/fileUploadMarker,/appDeviceAdd/getDevTypeLength,/appDeviceAdd/delete,/appUserOpenid/login,/appDeviceAdd/getWellTypeList,/appDeviceAdd/*,/websocket/*,/template/download, - /app/user/login,/app/user/project,/product/safe/add,/product/safe/sign-status,/product/safe/update,/well/pre/listPage - file-upload-path: D:\cz\203\临时项目\批产小程序\product-device\casic-web\src\main\resources\excel\ - file-download-path: D:\cz\203\临时项目\批产小程序\product-device\casic-web\src\main\resources\excel\ + /app/user/login,/app/user/project,/product/safe/add,/product/safe/sign-status,/product/safe/update,/well/pre/listPage,/product/safe/today-detail + file-upload-path: D:\cz\203\workspace\product-device\casic-web\src\main\resources\static\ + file-download-path: D:\cz\203\workspace\product-device\casic-web\src\main\resources\excel\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid appid: wx79419f886f8c77ef #微信小程序开发appid secret: 1bb1a8ed46c5217715e674ecd077e9ff #微信小程序开发密钥 - photoPath: https://logapi.smartlog.work/static/ #导出照片位置存放目录 + photoPath: http://192.168.8.110:8083/static/ #导出照片位置存放目录 export-file-delete: 0 0 */1 * * ? #日志文件有效扫描时间（现为一天扫描一次） file-valid-days: -1 #日志文件有效天数 logging: