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 697ad70..459256a 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 @@ -9,9 +9,11 @@ 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.exception.BizExceptionEnum; 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.exception.GunsException; import com.casic.missiles.core.log.LogObjectHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; @@ -20,12 +22,12 @@ 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 com.casic.missiles.modular.system.dto.PersonResDto; +import com.casic.missiles.modular.system.model.Person; 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; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -70,6 +72,26 @@ irisPersonService.deleteBatchIds(personIds); return ResponseData.success(); } + + /** + * 新增人员管理 + */ + @RequestMapping(value = "/irisAdd") + @ResponseBody + public Object add(@RequestBody Person person) { + try { + person.setOprationId(permissionService.getCurrLoginUser().getId()); + irisPersonService.insert(person); + return ResponseData.success(new PersonResDto(person.getPersonCode(), person.getId())); + } catch (DuplicateKeyException e) { + e.printStackTrace(); + GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + throw gunsException; + } + + } + /** * 人员导出列表 */ 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 697ad70..459256a 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 @@ -9,9 +9,11 @@ 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.exception.BizExceptionEnum; 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.exception.GunsException; import com.casic.missiles.core.log.LogObjectHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; @@ -20,12 +22,12 @@ 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 com.casic.missiles.modular.system.dto.PersonResDto; +import com.casic.missiles.modular.system.model.Person; 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; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -70,6 +72,26 @@ irisPersonService.deleteBatchIds(personIds); return ResponseData.success(); } + + /** + * 新增人员管理 + */ + @RequestMapping(value = "/irisAdd") + @ResponseBody + public Object add(@RequestBody Person person) { + try { + person.setOprationId(permissionService.getCurrLoginUser().getId()); + irisPersonService.insert(person); + return ResponseData.success(new PersonResDto(person.getPersonCode(), person.getId())); + } catch (DuplicateKeyException e) { + e.printStackTrace(); + GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + throw gunsException; + } + + } + /** * 人员导出列表 */ diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/PersonTypeEnums.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/PersonTypeEnums.java new file mode 100644 index 0000000..f8119a5 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/PersonTypeEnums.java @@ -0,0 +1,53 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by Fernflower decompiler) +// + +package com.casic.missiles.modular.register.enums; + +public enum PersonTypeEnums { + VISITOR("0", "FK", "添加"), + STAFF("1", "", "删除"); + + private String value; + private String code; + private String name; + + private PersonTypeEnums(String value, String code, String name) { + this.value = value; + this.code = code; + this.name = name; + } + + public String getCode() { + return this.code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static PersonTypeEnums typeOf(String value){ + switch (value){ + case "0": + return VISITOR; + default: return STAFF; + } + } +} 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 697ad70..459256a 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 @@ -9,9 +9,11 @@ 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.exception.BizExceptionEnum; 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.exception.GunsException; import com.casic.missiles.core.log.LogObjectHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; @@ -20,12 +22,12 @@ 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 com.casic.missiles.modular.system.dto.PersonResDto; +import com.casic.missiles.modular.system.model.Person; 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; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -70,6 +72,26 @@ irisPersonService.deleteBatchIds(personIds); return ResponseData.success(); } + + /** + * 新增人员管理 + */ + @RequestMapping(value = "/irisAdd") + @ResponseBody + public Object add(@RequestBody Person person) { + try { + person.setOprationId(permissionService.getCurrLoginUser().getId()); + irisPersonService.insert(person); + return ResponseData.success(new PersonResDto(person.getPersonCode(), person.getId())); + } catch (DuplicateKeyException e) { + e.printStackTrace(); + GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + throw gunsException; + } + + } + /** * 人员导出列表 */ diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/PersonTypeEnums.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/PersonTypeEnums.java new file mode 100644 index 0000000..f8119a5 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/PersonTypeEnums.java @@ -0,0 +1,53 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by Fernflower decompiler) +// + +package com.casic.missiles.modular.register.enums; + +public enum PersonTypeEnums { + VISITOR("0", "FK", "添加"), + STAFF("1", "", "删除"); + + private String value; + private String code; + private String name; + + private PersonTypeEnums(String value, String code, String name) { + this.value = value; + this.code = code; + this.name = name; + } + + public String getCode() { + return this.code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static PersonTypeEnums typeOf(String value){ + switch (value){ + case "0": + return VISITOR; + default: return STAFF; + } + } +} 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 7f95540..d459228 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.register.model.IrisData; +import com.casic.missiles.modular.system.model.Person; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -24,4 +25,6 @@ void deleteById(Long personId); void deleteBatchIds(List personIds); + + void insert(Person person); } 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 697ad70..459256a 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 @@ -9,9 +9,11 @@ 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.exception.BizExceptionEnum; 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.exception.GunsException; import com.casic.missiles.core.log.LogObjectHolder; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; @@ -20,12 +22,12 @@ 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 com.casic.missiles.modular.system.dto.PersonResDto; +import com.casic.missiles.modular.system.model.Person; 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; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -70,6 +72,26 @@ irisPersonService.deleteBatchIds(personIds); return ResponseData.success(); } + + /** + * 新增人员管理 + */ + @RequestMapping(value = "/irisAdd") + @ResponseBody + public Object add(@RequestBody Person person) { + try { + person.setOprationId(permissionService.getCurrLoginUser().getId()); + irisPersonService.insert(person); + return ResponseData.success(new PersonResDto(person.getPersonCode(), person.getId())); + } catch (DuplicateKeyException e) { + e.printStackTrace(); + GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + throw gunsException; + } + + } + /** * 人员导出列表 */ diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/PersonTypeEnums.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/PersonTypeEnums.java new file mode 100644 index 0000000..f8119a5 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/PersonTypeEnums.java @@ -0,0 +1,53 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by Fernflower decompiler) +// + +package com.casic.missiles.modular.register.enums; + +public enum PersonTypeEnums { + VISITOR("0", "FK", "添加"), + STAFF("1", "", "删除"); + + private String value; + private String code; + private String name; + + private PersonTypeEnums(String value, String code, String name) { + this.value = value; + this.code = code; + this.name = name; + } + + public String getCode() { + return this.code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static PersonTypeEnums typeOf(String value){ + switch (value){ + case "0": + return VISITOR; + default: return STAFF; + } + } +} 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 7f95540..d459228 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.register.model.IrisData; +import com.casic.missiles.modular.system.model.Person; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -24,4 +25,6 @@ void deleteById(Long personId); void deleteBatchIds(List personIds); + + void insert(Person person); } 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 ee1e382..709c70b 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 @@ -15,7 +15,9 @@ 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 com.casic.missiles.modular.system.model.Person; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,6 +29,8 @@ @Service public class IrisPersonServiceImpl implements IIrisPersonService { + @Value("${casic.base.personPrefix:}") + private String personPrefix; @Autowired private ICommonPersonService personService; @Autowired @@ -70,16 +74,35 @@ del.eq("PERSON_ID", personId); irisDataService.delete(del); } + @Transactional(rollbackFor = Exception.class) @Override public void deleteBatchIds(List personIds) { - if(ToolUtil.isNotEmpty(personIds)){ + if (ToolUtil.isNotEmpty(personIds)) { for (Long personId : personIds) { this.deleteById(personId); } } } + @Transactional(rollbackFor = Exception.class) + @Override + public void insert(Person person) { + //REMOVE 查询最大人员编码 +// if (ToolUtil.isEmpty(person.getPersonCode())) { +// String currDay = DateUtil.getDays(); +// String personCode = personService.selectMaxPersonCode(person.getPersonType(), currDay); +// String code = PersonTypeEnums.typeOf(person.getPersonType()).getCode(); +// String prefix = ToolUtil.isEmpty(code) ? personPrefix : code; +// personCode = personCode.replaceAll(prefix, ""); +// if (!"0".equals(personCode)) { +// personCode = personCode.substring(8); +// } +// person.setPersonCode(prefix.concat(currDay).concat(String.format("%06d", Integer.valueOf(personCode) + 1))); +// } + personService.addPerson(person); + } + private void wrap(Map map) { map.put("deptName", permissionService.getDeptName((Serializable) map.get("deptid"))); if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_SEX_KEY))) {