diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 5fbb354..007d778 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -39,6 +39,11 @@ casic-export-support ${casic.version} + + com.casic + casic-file-support + ${casic.version} + diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 5fbb354..007d778 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -39,6 +39,11 @@ casic-export-support ${casic.version} + + com.casic + casic-file-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 84c2ed6..4a169ac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -101,7 +101,7 @@ /** - * 下发虹膜数据接口 + * 下发虹膜数据接口(测试用) */ @RequestMapping(value = "/sendData") @ResponseBody diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 5fbb354..007d778 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -39,6 +39,11 @@ casic-export-support ${casic.version} + + com.casic + casic-file-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 84c2ed6..4a169ac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -101,7 +101,7 @@ /** - * 下发虹膜数据接口 + * 下发虹膜数据接口(测试用) */ @RequestMapping(value = "/sendData") @ResponseBody 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 459256a..8318895 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 @@ -18,12 +18,15 @@ 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.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisDataService; +import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; 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 com.casic.missiles.service.ICasicFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.dao.DuplicateKeyException; @@ -51,6 +54,12 @@ private IIrisPersonService irisPersonService; @Autowired + private IIrisPersonPhotoService iIrisPersonPhotoService; + + @Autowired + private ICasicFileService fileService; + + @Autowired private ICommonPersonService personService; @Value("${casic.person.visitor:false}") private boolean iscVisitor; @@ -80,8 +89,20 @@ @ResponseBody public Object add(@RequestBody Person person) { try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + } person.setOprationId(permissionService.getCurrLoginUser().getId()); irisPersonService.insert(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } return ResponseData.success(new PersonResDto(person.getPersonCode(), person.getId())); } catch (DuplicateKeyException e) { e.printStackTrace(); @@ -89,7 +110,42 @@ gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); throw gunsException; } + } + /** + * 编辑人员 + */ + @RequestMapping(value = "/irisUpdate") + @ResponseBody + public Object update(@RequestBody Person person) { + try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + person.setOprationId(permissionService.getCurrLoginUser().getId()); + } + irisPersonService.update(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = iIrisPersonPhotoService.selectById(person.getId()); + if(ToolUtil.isNotEmpty(personPhoto)){ + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.updateById(personPhoto); + }else{ + personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } + } + 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/pom.xml b/casic-iris-register/pom.xml index 5fbb354..007d778 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -39,6 +39,11 @@ casic-export-support ${casic.version} + + com.casic + casic-file-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 84c2ed6..4a169ac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -101,7 +101,7 @@ /** - * 下发虹膜数据接口 + * 下发虹膜数据接口(测试用) */ @RequestMapping(value = "/sendData") @ResponseBody 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 459256a..8318895 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 @@ -18,12 +18,15 @@ 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.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisDataService; +import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; 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 com.casic.missiles.service.ICasicFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.dao.DuplicateKeyException; @@ -51,6 +54,12 @@ private IIrisPersonService irisPersonService; @Autowired + private IIrisPersonPhotoService iIrisPersonPhotoService; + + @Autowired + private ICasicFileService fileService; + + @Autowired private ICommonPersonService personService; @Value("${casic.person.visitor:false}") private boolean iscVisitor; @@ -80,8 +89,20 @@ @ResponseBody public Object add(@RequestBody Person person) { try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + } person.setOprationId(permissionService.getCurrLoginUser().getId()); irisPersonService.insert(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } return ResponseData.success(new PersonResDto(person.getPersonCode(), person.getId())); } catch (DuplicateKeyException e) { e.printStackTrace(); @@ -89,7 +110,42 @@ gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); throw gunsException; } + } + /** + * 编辑人员 + */ + @RequestMapping(value = "/irisUpdate") + @ResponseBody + public Object update(@RequestBody Person person) { + try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + person.setOprationId(permissionService.getCurrLoginUser().getId()); + } + irisPersonService.update(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = iIrisPersonPhotoService.selectById(person.getId()); + if(ToolUtil.isNotEmpty(personPhoto)){ + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.updateById(personPhoto); + }else{ + personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } + } + 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/dao/IrisPersonPhotoMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java new file mode 100644 index 0000000..7e8c66e --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.register.dao; + +import com.casic.missiles.modular.register.model.IrisPersonPhoto; +import com.baomidou.mybatisplus.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +public interface IrisPersonPhotoMapper extends BaseMapper { + +} diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 5fbb354..007d778 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -39,6 +39,11 @@ casic-export-support ${casic.version} + + com.casic + casic-file-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 84c2ed6..4a169ac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -101,7 +101,7 @@ /** - * 下发虹膜数据接口 + * 下发虹膜数据接口(测试用) */ @RequestMapping(value = "/sendData") @ResponseBody 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 459256a..8318895 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 @@ -18,12 +18,15 @@ 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.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisDataService; +import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; 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 com.casic.missiles.service.ICasicFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.dao.DuplicateKeyException; @@ -51,6 +54,12 @@ private IIrisPersonService irisPersonService; @Autowired + private IIrisPersonPhotoService iIrisPersonPhotoService; + + @Autowired + private ICasicFileService fileService; + + @Autowired private ICommonPersonService personService; @Value("${casic.person.visitor:false}") private boolean iscVisitor; @@ -80,8 +89,20 @@ @ResponseBody public Object add(@RequestBody Person person) { try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + } person.setOprationId(permissionService.getCurrLoginUser().getId()); irisPersonService.insert(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } return ResponseData.success(new PersonResDto(person.getPersonCode(), person.getId())); } catch (DuplicateKeyException e) { e.printStackTrace(); @@ -89,7 +110,42 @@ gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); throw gunsException; } + } + /** + * 编辑人员 + */ + @RequestMapping(value = "/irisUpdate") + @ResponseBody + public Object update(@RequestBody Person person) { + try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + person.setOprationId(permissionService.getCurrLoginUser().getId()); + } + irisPersonService.update(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = iIrisPersonPhotoService.selectById(person.getId()); + if(ToolUtil.isNotEmpty(personPhoto)){ + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.updateById(personPhoto); + }else{ + personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } + } + 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/dao/IrisPersonPhotoMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java new file mode 100644 index 0000000..7e8c66e --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.register.dao; + +import com.casic.missiles.modular.register.model.IrisPersonPhoto; +import com.baomidou.mybatisplus.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +public interface IrisPersonPhotoMapper extends BaseMapper { + +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml new file mode 100644 index 0000000..a9aaea4 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + PERSON_ID AS personId, PHOTO_DATA AS photoData + + + diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 5fbb354..007d778 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -39,6 +39,11 @@ casic-export-support ${casic.version} + + com.casic + casic-file-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 84c2ed6..4a169ac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -101,7 +101,7 @@ /** - * 下发虹膜数据接口 + * 下发虹膜数据接口(测试用) */ @RequestMapping(value = "/sendData") @ResponseBody 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 459256a..8318895 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 @@ -18,12 +18,15 @@ 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.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisDataService; +import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; 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 com.casic.missiles.service.ICasicFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.dao.DuplicateKeyException; @@ -51,6 +54,12 @@ private IIrisPersonService irisPersonService; @Autowired + private IIrisPersonPhotoService iIrisPersonPhotoService; + + @Autowired + private ICasicFileService fileService; + + @Autowired private ICommonPersonService personService; @Value("${casic.person.visitor:false}") private boolean iscVisitor; @@ -80,8 +89,20 @@ @ResponseBody public Object add(@RequestBody Person person) { try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + } person.setOprationId(permissionService.getCurrLoginUser().getId()); irisPersonService.insert(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } return ResponseData.success(new PersonResDto(person.getPersonCode(), person.getId())); } catch (DuplicateKeyException e) { e.printStackTrace(); @@ -89,7 +110,42 @@ gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); throw gunsException; } + } + /** + * 编辑人员 + */ + @RequestMapping(value = "/irisUpdate") + @ResponseBody + public Object update(@RequestBody Person person) { + try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + person.setOprationId(permissionService.getCurrLoginUser().getId()); + } + irisPersonService.update(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = iIrisPersonPhotoService.selectById(person.getId()); + if(ToolUtil.isNotEmpty(personPhoto)){ + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.updateById(personPhoto); + }else{ + personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } + } + 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/dao/IrisPersonPhotoMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java new file mode 100644 index 0000000..7e8c66e --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.register.dao; + +import com.casic.missiles.modular.register.model.IrisPersonPhoto; +import com.baomidou.mybatisplus.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +public interface IrisPersonPhotoMapper extends BaseMapper { + +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml new file mode 100644 index 0000000..a9aaea4 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + PERSON_ID AS personId, PHOTO_DATA AS photoData + + + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java new file mode 100644 index 0000000..d77f2d1 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java @@ -0,0 +1,64 @@ +package com.casic.missiles.modular.register.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +@TableName("iris_person_photo") +public class IrisPersonPhoto extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 人员ID + */ + @TableId("PERSON_ID") + private Long personId; + /** + * 照片base64 + */ + @TableField("PHOTO_DATA") + private String photoData; + + + public Long getPersonId() { + return personId; + } + + public void setPersonId(Long personId) { + this.personId = personId; + } + + public String getPhotoData() { + return photoData; + } + + public void setPhotoData(String photoData) { + this.photoData = photoData; + } + + @Override + protected Serializable pkVal() { + return this.personId; + } + + @Override + public String toString() { + return "IrisPersonPhoto{" + + "personId=" + personId + + ", photoData=" + photoData + + "}"; + } +} diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 5fbb354..007d778 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -39,6 +39,11 @@ casic-export-support ${casic.version} + + com.casic + casic-file-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 84c2ed6..4a169ac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -101,7 +101,7 @@ /** - * 下发虹膜数据接口 + * 下发虹膜数据接口(测试用) */ @RequestMapping(value = "/sendData") @ResponseBody 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 459256a..8318895 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 @@ -18,12 +18,15 @@ 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.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisDataService; +import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; 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 com.casic.missiles.service.ICasicFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.dao.DuplicateKeyException; @@ -51,6 +54,12 @@ private IIrisPersonService irisPersonService; @Autowired + private IIrisPersonPhotoService iIrisPersonPhotoService; + + @Autowired + private ICasicFileService fileService; + + @Autowired private ICommonPersonService personService; @Value("${casic.person.visitor:false}") private boolean iscVisitor; @@ -80,8 +89,20 @@ @ResponseBody public Object add(@RequestBody Person person) { try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + } person.setOprationId(permissionService.getCurrLoginUser().getId()); irisPersonService.insert(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } return ResponseData.success(new PersonResDto(person.getPersonCode(), person.getId())); } catch (DuplicateKeyException e) { e.printStackTrace(); @@ -89,7 +110,42 @@ gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); throw gunsException; } + } + /** + * 编辑人员 + */ + @RequestMapping(value = "/irisUpdate") + @ResponseBody + public Object update(@RequestBody Person person) { + try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + person.setOprationId(permissionService.getCurrLoginUser().getId()); + } + irisPersonService.update(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = iIrisPersonPhotoService.selectById(person.getId()); + if(ToolUtil.isNotEmpty(personPhoto)){ + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.updateById(personPhoto); + }else{ + personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } + } + 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/dao/IrisPersonPhotoMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java new file mode 100644 index 0000000..7e8c66e --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.register.dao; + +import com.casic.missiles.modular.register.model.IrisPersonPhoto; +import com.baomidou.mybatisplus.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +public interface IrisPersonPhotoMapper extends BaseMapper { + +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml new file mode 100644 index 0000000..a9aaea4 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + PERSON_ID AS personId, PHOTO_DATA AS photoData + + + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java new file mode 100644 index 0000000..d77f2d1 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java @@ -0,0 +1,64 @@ +package com.casic.missiles.modular.register.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +@TableName("iris_person_photo") +public class IrisPersonPhoto extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 人员ID + */ + @TableId("PERSON_ID") + private Long personId; + /** + * 照片base64 + */ + @TableField("PHOTO_DATA") + private String photoData; + + + public Long getPersonId() { + return personId; + } + + public void setPersonId(Long personId) { + this.personId = personId; + } + + public String getPhotoData() { + return photoData; + } + + public void setPhotoData(String photoData) { + this.photoData = photoData; + } + + @Override + protected Serializable pkVal() { + return this.personId; + } + + @Override + public String toString() { + return "IrisPersonPhoto{" + + "personId=" + personId + + ", photoData=" + photoData + + "}"; + } +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonPhotoService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonPhotoService.java new file mode 100644 index 0000000..3e3723e --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonPhotoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.register.service; + +import com.casic.missiles.modular.register.model.IrisPersonPhoto; +import com.baomidou.mybatisplus.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +public interface IIrisPersonPhotoService extends IService { + +} diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 5fbb354..007d778 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -39,6 +39,11 @@ casic-export-support ${casic.version} + + com.casic + casic-file-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 84c2ed6..4a169ac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -101,7 +101,7 @@ /** - * 下发虹膜数据接口 + * 下发虹膜数据接口(测试用) */ @RequestMapping(value = "/sendData") @ResponseBody 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 459256a..8318895 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 @@ -18,12 +18,15 @@ 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.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisDataService; +import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; 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 com.casic.missiles.service.ICasicFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.dao.DuplicateKeyException; @@ -51,6 +54,12 @@ private IIrisPersonService irisPersonService; @Autowired + private IIrisPersonPhotoService iIrisPersonPhotoService; + + @Autowired + private ICasicFileService fileService; + + @Autowired private ICommonPersonService personService; @Value("${casic.person.visitor:false}") private boolean iscVisitor; @@ -80,8 +89,20 @@ @ResponseBody public Object add(@RequestBody Person person) { try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + } person.setOprationId(permissionService.getCurrLoginUser().getId()); irisPersonService.insert(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } return ResponseData.success(new PersonResDto(person.getPersonCode(), person.getId())); } catch (DuplicateKeyException e) { e.printStackTrace(); @@ -89,7 +110,42 @@ gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); throw gunsException; } + } + /** + * 编辑人员 + */ + @RequestMapping(value = "/irisUpdate") + @ResponseBody + public Object update(@RequestBody Person person) { + try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + person.setOprationId(permissionService.getCurrLoginUser().getId()); + } + irisPersonService.update(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = iIrisPersonPhotoService.selectById(person.getId()); + if(ToolUtil.isNotEmpty(personPhoto)){ + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.updateById(personPhoto); + }else{ + personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } + } + 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/dao/IrisPersonPhotoMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java new file mode 100644 index 0000000..7e8c66e --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.register.dao; + +import com.casic.missiles.modular.register.model.IrisPersonPhoto; +import com.baomidou.mybatisplus.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +public interface IrisPersonPhotoMapper extends BaseMapper { + +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml new file mode 100644 index 0000000..a9aaea4 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + PERSON_ID AS personId, PHOTO_DATA AS photoData + + + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java new file mode 100644 index 0000000..d77f2d1 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java @@ -0,0 +1,64 @@ +package com.casic.missiles.modular.register.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +@TableName("iris_person_photo") +public class IrisPersonPhoto extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 人员ID + */ + @TableId("PERSON_ID") + private Long personId; + /** + * 照片base64 + */ + @TableField("PHOTO_DATA") + private String photoData; + + + public Long getPersonId() { + return personId; + } + + public void setPersonId(Long personId) { + this.personId = personId; + } + + public String getPhotoData() { + return photoData; + } + + public void setPhotoData(String photoData) { + this.photoData = photoData; + } + + @Override + protected Serializable pkVal() { + return this.personId; + } + + @Override + public String toString() { + return "IrisPersonPhoto{" + + "personId=" + personId + + ", photoData=" + photoData + + "}"; + } +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonPhotoService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonPhotoService.java new file mode 100644 index 0000000..3e3723e --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonPhotoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.register.service; + +import com.casic.missiles.modular.register.model.IrisPersonPhoto; +import com.baomidou.mybatisplus.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +public interface IIrisPersonPhotoService extends IService { + +} 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 d459228..68b16a8 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 @@ -27,4 +27,6 @@ void deleteBatchIds(List personIds); void insert(Person person); + + void update(Person person); } diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 5fbb354..007d778 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -39,6 +39,11 @@ casic-export-support ${casic.version} + + com.casic + casic-file-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 84c2ed6..4a169ac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -101,7 +101,7 @@ /** - * 下发虹膜数据接口 + * 下发虹膜数据接口(测试用) */ @RequestMapping(value = "/sendData") @ResponseBody 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 459256a..8318895 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 @@ -18,12 +18,15 @@ 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.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisDataService; +import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; 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 com.casic.missiles.service.ICasicFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.dao.DuplicateKeyException; @@ -51,6 +54,12 @@ private IIrisPersonService irisPersonService; @Autowired + private IIrisPersonPhotoService iIrisPersonPhotoService; + + @Autowired + private ICasicFileService fileService; + + @Autowired private ICommonPersonService personService; @Value("${casic.person.visitor:false}") private boolean iscVisitor; @@ -80,8 +89,20 @@ @ResponseBody public Object add(@RequestBody Person person) { try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + } person.setOprationId(permissionService.getCurrLoginUser().getId()); irisPersonService.insert(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } return ResponseData.success(new PersonResDto(person.getPersonCode(), person.getId())); } catch (DuplicateKeyException e) { e.printStackTrace(); @@ -89,7 +110,42 @@ gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); throw gunsException; } + } + /** + * 编辑人员 + */ + @RequestMapping(value = "/irisUpdate") + @ResponseBody + public Object update(@RequestBody Person person) { + try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + person.setOprationId(permissionService.getCurrLoginUser().getId()); + } + irisPersonService.update(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = iIrisPersonPhotoService.selectById(person.getId()); + if(ToolUtil.isNotEmpty(personPhoto)){ + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.updateById(personPhoto); + }else{ + personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } + } + 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/dao/IrisPersonPhotoMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java new file mode 100644 index 0000000..7e8c66e --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.register.dao; + +import com.casic.missiles.modular.register.model.IrisPersonPhoto; +import com.baomidou.mybatisplus.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +public interface IrisPersonPhotoMapper extends BaseMapper { + +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml new file mode 100644 index 0000000..a9aaea4 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + PERSON_ID AS personId, PHOTO_DATA AS photoData + + + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java new file mode 100644 index 0000000..d77f2d1 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java @@ -0,0 +1,64 @@ +package com.casic.missiles.modular.register.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +@TableName("iris_person_photo") +public class IrisPersonPhoto extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 人员ID + */ + @TableId("PERSON_ID") + private Long personId; + /** + * 照片base64 + */ + @TableField("PHOTO_DATA") + private String photoData; + + + public Long getPersonId() { + return personId; + } + + public void setPersonId(Long personId) { + this.personId = personId; + } + + public String getPhotoData() { + return photoData; + } + + public void setPhotoData(String photoData) { + this.photoData = photoData; + } + + @Override + protected Serializable pkVal() { + return this.personId; + } + + @Override + public String toString() { + return "IrisPersonPhoto{" + + "personId=" + personId + + ", photoData=" + photoData + + "}"; + } +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonPhotoService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonPhotoService.java new file mode 100644 index 0000000..3e3723e --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonPhotoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.register.service; + +import com.casic.missiles.modular.register.model.IrisPersonPhoto; +import com.baomidou.mybatisplus.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +public interface IIrisPersonPhotoService extends IService { + +} 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 d459228..68b16a8 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 @@ -27,4 +27,6 @@ void deleteBatchIds(List personIds); void insert(Person person); + + void update(Person person); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java new file mode 100644 index 0000000..748517a --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.register.service.impl; + +import com.casic.missiles.modular.register.dao.IrisPersonPhotoMapper; +import com.casic.missiles.modular.register.model.IrisPersonPhoto; +import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +@Service +public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService { + +} diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 5fbb354..007d778 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -39,6 +39,11 @@ casic-export-support ${casic.version} + + com.casic + casic-file-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 84c2ed6..4a169ac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -101,7 +101,7 @@ /** - * 下发虹膜数据接口 + * 下发虹膜数据接口(测试用) */ @RequestMapping(value = "/sendData") @ResponseBody 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 459256a..8318895 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 @@ -18,12 +18,15 @@ 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.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisDataService; +import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; 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 com.casic.missiles.service.ICasicFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.dao.DuplicateKeyException; @@ -51,6 +54,12 @@ private IIrisPersonService irisPersonService; @Autowired + private IIrisPersonPhotoService iIrisPersonPhotoService; + + @Autowired + private ICasicFileService fileService; + + @Autowired private ICommonPersonService personService; @Value("${casic.person.visitor:false}") private boolean iscVisitor; @@ -80,8 +89,20 @@ @ResponseBody public Object add(@RequestBody Person person) { try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + } person.setOprationId(permissionService.getCurrLoginUser().getId()); irisPersonService.insert(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } return ResponseData.success(new PersonResDto(person.getPersonCode(), person.getId())); } catch (DuplicateKeyException e) { e.printStackTrace(); @@ -89,7 +110,42 @@ gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); throw gunsException; } + } + /** + * 编辑人员 + */ + @RequestMapping(value = "/irisUpdate") + @ResponseBody + public Object update(@RequestBody Person person) { + try { + person.setDelflag("0"); + String photoData = person.getPhoto(); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + String photoPath = fileService.saveFile(photoData); + person.setPhoto(photoPath); + person.setOprationId(permissionService.getCurrLoginUser().getId()); + } + irisPersonService.update(person); + if(ToolUtil.isNotEmpty(person.getPhoto())){ + IrisPersonPhoto personPhoto = iIrisPersonPhotoService.selectById(person.getId()); + if(ToolUtil.isNotEmpty(personPhoto)){ + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.updateById(personPhoto); + }else{ + personPhoto = new IrisPersonPhoto(); + personPhoto.setPersonId(person.getId()); + personPhoto.setPhotoData(photoData); + iIrisPersonPhotoService.insert(personPhoto); + } + } + 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/dao/IrisPersonPhotoMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java new file mode 100644 index 0000000..7e8c66e --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonPhotoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.register.dao; + +import com.casic.missiles.modular.register.model.IrisPersonPhoto; +import com.baomidou.mybatisplus.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +public interface IrisPersonPhotoMapper extends BaseMapper { + +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml new file mode 100644 index 0000000..a9aaea4 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/mapping/IrisPersonPhotoMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + PERSON_ID AS personId, PHOTO_DATA AS photoData + + + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java new file mode 100644 index 0000000..d77f2d1 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/model/IrisPersonPhoto.java @@ -0,0 +1,64 @@ +package com.casic.missiles.modular.register.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +@TableName("iris_person_photo") +public class IrisPersonPhoto extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 人员ID + */ + @TableId("PERSON_ID") + private Long personId; + /** + * 照片base64 + */ + @TableField("PHOTO_DATA") + private String photoData; + + + public Long getPersonId() { + return personId; + } + + public void setPersonId(Long personId) { + this.personId = personId; + } + + public String getPhotoData() { + return photoData; + } + + public void setPhotoData(String photoData) { + this.photoData = photoData; + } + + @Override + protected Serializable pkVal() { + return this.personId; + } + + @Override + public String toString() { + return "IrisPersonPhoto{" + + "personId=" + personId + + ", photoData=" + photoData + + "}"; + } +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonPhotoService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonPhotoService.java new file mode 100644 index 0000000..3e3723e --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonPhotoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.register.service; + +import com.casic.missiles.modular.register.model.IrisPersonPhoto; +import com.baomidou.mybatisplus.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +public interface IIrisPersonPhotoService extends IService { + +} 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 d459228..68b16a8 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 @@ -27,4 +27,6 @@ void deleteBatchIds(List personIds); void insert(Person person); + + void update(Person person); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java new file mode 100644 index 0000000..748517a --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.register.service.impl; + +import com.casic.missiles.modular.register.dao.IrisPersonPhotoMapper; +import com.casic.missiles.modular.register.model.IrisPersonPhoto; +import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-04-01 + */ +@Service +public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService { + +} 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 709c70b..d936cc2 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 @@ -103,6 +103,11 @@ personService.addPerson(person); } + @Override + public void update(Person person) { + personService.updatePerson(person); + } + private void wrap(Map map) { map.put("deptName", permissionService.getDeptName((Serializable) map.get("deptid"))); if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_SEX_KEY))) {