diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index 04cfaea..75d959d 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -5,20 +5,25 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.PersonConst; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.common.service.ICommonPersonService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.log.LogObjectHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; import com.casic.missiles.modular.register.enums.IrisExportEnum; +import com.casic.missiles.modular.register.service.IIrisDataService; import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.register.util.Base64Util; import com.casic.missiles.modular.system.dto.PersonDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @@ -47,7 +52,15 @@ private ICommonPersonService personService; @Value("${casic.person.visitor:false}") private boolean iscVisitor; - + /** + * 删除人员管理 + */ + @RequestMapping(value = "/deleteIrisPerson") + @ResponseBody + public Object delete(@RequestParam Long personId) { + irisPersonService.deleteById(personId); + return ResponseData.success(); + } /** * 人员导出列表 */ diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index 04cfaea..75d959d 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -5,20 +5,25 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.PersonConst; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.common.service.ICommonPersonService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.log.LogObjectHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; import com.casic.missiles.modular.register.enums.IrisExportEnum; +import com.casic.missiles.modular.register.service.IIrisDataService; import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.register.util.Base64Util; import com.casic.missiles.modular.system.dto.PersonDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @@ -47,7 +52,15 @@ private ICommonPersonService personService; @Value("${casic.person.visitor:false}") private boolean iscVisitor; - + /** + * 删除人员管理 + */ + @RequestMapping(value = "/deleteIrisPerson") + @ResponseBody + public Object delete(@RequestParam Long personId) { + irisPersonService.deleteById(personId); + return ResponseData.success(); + } /** * 人员导出列表 */ diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 1896ec5..f0674fc 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -20,4 +20,6 @@ */ public interface IIrisPersonService { List> selectDataScopePersonMap(Page> page, DataScope dataScope, EntityWrapper wrapper); + + void deleteById(Long personId); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index 04cfaea..75d959d 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -5,20 +5,25 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.PersonConst; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.common.service.ICommonPersonService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.log.LogObjectHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; import com.casic.missiles.modular.register.enums.IrisExportEnum; +import com.casic.missiles.modular.register.service.IIrisDataService; import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.register.util.Base64Util; import com.casic.missiles.modular.system.dto.PersonDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @@ -47,7 +52,15 @@ private ICommonPersonService personService; @Value("${casic.person.visitor:false}") private boolean iscVisitor; - + /** + * 删除人员管理 + */ + @RequestMapping(value = "/deleteIrisPerson") + @ResponseBody + public Object delete(@RequestParam Long personId) { + irisPersonService.deleteById(personId); + return ResponseData.success(); + } /** * 人员导出列表 */ diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 1896ec5..f0674fc 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -20,4 +20,6 @@ */ public interface IIrisPersonService { List> selectDataScopePersonMap(Page> page, DataScope dataScope, EntityWrapper wrapper); + + void deleteById(Long personId); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java index 7a75f34..691d519 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -12,6 +12,7 @@ import com.casic.missiles.modular.metadata.service.IMetadataSupportService; import com.casic.missiles.modular.register.constant.IrisPersonConst; import com.casic.missiles.modular.register.dao.IrisDataMapper; +import com.casic.missiles.modular.register.service.IIrisDataService; import com.casic.missiles.modular.register.service.IIrisPersonService; import com.casic.missiles.modular.system.dto.PersonDto; import org.springframework.beans.factory.annotation.Autowired; @@ -34,6 +35,8 @@ private IrisDataMapper mapper; @Autowired private IMetadataSupportService supportService; + @Autowired + private IIrisDataService irisDataService; @Transactional(rollbackFor = Exception.class) @Override @@ -47,13 +50,27 @@ wrap(scopePerson); scopePerson.put("ext", supportService.selectOneMetaDataByTargetId(bean.name(), id)); String isRegist = String.valueOf(personSet.contains(id) ? 1 : 0); - scopePerson.put("isRegist",isRegist); + scopePerson.put("isRegist", isRegist); scopePerson.put("isRegistName", Const.ONE.equals(isRegist) ? "已注册" : "未注册"); } } return scopePersons; } + /** + * 删除人员接口 + * + * @param personId + */ + @Transactional(rollbackFor = Exception.class) + @Override + public void deleteById(Long personId) { + personService.deleteById(personId); + EntityWrapper del = new EntityWrapper(); + del.eq("PERSON_ID", personId); + irisDataService.delete(del); + } + private void wrap(Map map) { map.put("deptName", permissionService.getDeptName((Serializable) map.get("deptid"))); if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_SEX_KEY))) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index 04cfaea..75d959d 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -5,20 +5,25 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.PersonConst; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.common.service.ICommonPersonService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.log.LogObjectHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; import com.casic.missiles.modular.register.enums.IrisExportEnum; +import com.casic.missiles.modular.register.service.IIrisDataService; import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.register.util.Base64Util; import com.casic.missiles.modular.system.dto.PersonDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @@ -47,7 +52,15 @@ private ICommonPersonService personService; @Value("${casic.person.visitor:false}") private boolean iscVisitor; - + /** + * 删除人员管理 + */ + @RequestMapping(value = "/deleteIrisPerson") + @ResponseBody + public Object delete(@RequestParam Long personId) { + irisPersonService.deleteById(personId); + return ResponseData.success(); + } /** * 人员导出列表 */ diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 1896ec5..f0674fc 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -20,4 +20,6 @@ */ public interface IIrisPersonService { List> selectDataScopePersonMap(Page> page, DataScope dataScope, EntityWrapper wrapper); + + void deleteById(Long personId); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java index 7a75f34..691d519 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -12,6 +12,7 @@ import com.casic.missiles.modular.metadata.service.IMetadataSupportService; import com.casic.missiles.modular.register.constant.IrisPersonConst; import com.casic.missiles.modular.register.dao.IrisDataMapper; +import com.casic.missiles.modular.register.service.IIrisDataService; import com.casic.missiles.modular.register.service.IIrisPersonService; import com.casic.missiles.modular.system.dto.PersonDto; import org.springframework.beans.factory.annotation.Autowired; @@ -34,6 +35,8 @@ private IrisDataMapper mapper; @Autowired private IMetadataSupportService supportService; + @Autowired + private IIrisDataService irisDataService; @Transactional(rollbackFor = Exception.class) @Override @@ -47,13 +50,27 @@ wrap(scopePerson); scopePerson.put("ext", supportService.selectOneMetaDataByTargetId(bean.name(), id)); String isRegist = String.valueOf(personSet.contains(id) ? 1 : 0); - scopePerson.put("isRegist",isRegist); + scopePerson.put("isRegist", isRegist); scopePerson.put("isRegistName", Const.ONE.equals(isRegist) ? "已注册" : "未注册"); } } return scopePersons; } + /** + * 删除人员接口 + * + * @param personId + */ + @Transactional(rollbackFor = Exception.class) + @Override + public void deleteById(Long personId) { + personService.deleteById(personId); + EntityWrapper del = new EntityWrapper(); + del.eq("PERSON_ID", personId); + irisDataService.delete(del); + } + private void wrap(Map map) { map.put("deptName", permissionService.getDeptName((Serializable) map.get("deptid"))); if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_SEX_KEY))) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 0770aa9..5ae9a0f 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -3,7 +3,7 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://139.198.16.38:8098/casic_iris?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://139.198.16.38:8098/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: Casic203 initial-size: 2