解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/PersonBasicMapper.java

@@ -26,4 +26,6 @@ public interface PersonBasicMapper extends BaseMapper<PersonBasic> {
             String accountName,
             String projectName);
 
+    int deleteList(String[] ids);
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonBasicMapper.xml

@@ -59,5 +59,27 @@
         </where>
     </select>
 
+    <delete id="deleteList"  parameterType="int">
+        delete from person_basic where sequence_nbr in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>;
+        delete from person_account where person_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>;
+        delete from person_ascription where person_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>;
+        delete from person_certificate where person_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>;
+        delete from person_skill_education where person_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -54,8 +54,11 @@
     delete from station_basic where sequence_nbr in
     <foreach item="id" collection="array" open="(" separator="," close=")">
         #{id}
+    </foreach>;
+    delete from station_coordinate where station_id in
+    <foreach item="id" collection="array" open="(" separator="," close=")">
+        #{id}
     </foreach>
-
 </delete>
 
 

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PersonBasicController.java

@@ -56,22 +56,24 @@ public class PersonBasicController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新人员基本信息", notes = "根据sequenceNbr更新人员基本信息")
-	public ResponseModel<PersonBasicDto> updateBySequenceNbrPersonBasic(@RequestBody PersonBasicDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(personBasicServiceImpl.updateWithModel(model));
+	public ResponseModel<PersonDto> updateBySequenceNbrPersonBasic(@RequestBody PersonDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr,HttpServletRequest httpServletRequest) {
+	    return ResponseHelper.buildResponse(personBasicServiceImpl.updatePerson(model,httpServletRequest));
 	}
 
 	/**
      * 根据sequenceNbr删除
      *
-     * @param sequenceNbr 主键
+     * @param ids 主键列表
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除人员基本信息", notes = "根据sequenceNbr删除人员基本信息")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(personBasicServiceImpl.removeById(sequenceNbr));
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,@RequestParam(value = "ids") String ids){
+		String[] idss=ids.split(",");
+		int num= personBasicServiceImpl.deletePerson(idss);
+
+		return ResponseHelper.buildResponse(num>0?true:false);
     }
 
     /**
@@ -83,8 +85,8 @@ public class PersonBasicController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个人员基本信息",  notes = "根据sequenceNbr查询单个人员基本信息")
-	public ResponseModel<PersonBasicDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(personBasicServiceImpl.queryBySeq(sequenceNbr));
+	public ResponseModel<PersonDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(personBasicServiceImpl.getPerson(sequenceNbr));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/fegin/PrivilegeFeignClient.java

 package com.yeejoin.amos.boot.module.jxiop.biz.fegin;
 
 import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUserVO;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.UserDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.*;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.*;
@@ -103,16 +104,91 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
     }
 
 
+    @Transactional
+    public PersonDto updatePerson(PersonDto model, HttpServletRequest httpServletRequest) {
+        String appKey = httpServletRequest.getHeader("appKey");
+        String product = httpServletRequest.getHeader("product");
+        String token = httpServletRequest.getHeader("token");
 
+        //获取人员基本信息数据
+        PersonUser personUser = model.getPersonUser();
+        //获取人员资质信息
+        PersonCertificate personCertificate = model.getPersonCertificate();
+        //获取人员账号信息
+        PersonAccount personAccount = model.getPersonAccount();
+
+        //人员基础信息
+        PersonBasic personBasic = new PersonBasic();
+        BeanUtils.copyProperties(personUser, personBasic);
+        this.saveOrUpdate(personBasic);
+        //人员归属信息
+        PersonAscription personAscription = new PersonAscription();
+        BeanUtils.copyProperties(personUser, personAscription);
+        personAscriptionService.saveOrUpdate(personAscription);
+        //人员归属信息
+        PersonSkillEducation personSkillEducation = new PersonSkillEducation();
+        BeanUtils.copyProperties(personUser, personSkillEducation);
+        personSkillEducationService.saveOrUpdate(personSkillEducation);
+        //人员资质信息
+        personCertificateService.saveOrUpdate(personCertificate);
+        //人员账号信息
+        personAccountService.saveOrUpdate(personAccount);
+        return model;
+    }
+
+    @Transactional
+    public PersonDto getPerson(Long sequenceNbr) {
+        PersonDto personDto = new PersonDto();
+        PersonUser personUser = new PersonUser();
+        QueryWrapper<PersonBasic> wrapper1 = new QueryWrapper();
+        wrapper1.eq("sequence_nbr", sequenceNbr);
+        wrapper1.eq("is_delete", 0);
+        //人员基础信息
+        PersonBasic personBasic = this.getOne(wrapper1);
+        BeanUtils.copyProperties(personBasic,personUser);
+
+        QueryWrapper<PersonAscription> wrapper2 = new QueryWrapper();
+        wrapper2.eq("person_id", sequenceNbr);
+        //人员归属信息
+        PersonAscription personAscription = personAscriptionService.getOne(wrapper2);
+        BeanUtils.copyProperties(personAscription,personUser);
+
+        //人员归属信息
+        QueryWrapper<PersonSkillEducation> wrapper3 = new QueryWrapper();
+        wrapper3.eq("person_id", sequenceNbr);
+        PersonSkillEducation personSkillEducation =personSkillEducationService.getOne(wrapper3);
+        BeanUtils.copyProperties(personSkillEducation,personUser);
+
+
+        QueryWrapper<PersonCertificate> wrapper4 = new QueryWrapper();
+        wrapper3.eq("person_id", sequenceNbr);
+        //人员资质信息
+        PersonCertificate personCertificate = personCertificateService.getOne(wrapper4);
+
+
+        QueryWrapper<PersonAccount> wrapper5 = new QueryWrapper();
+        wrapper3.eq("person_id", sequenceNbr);
+        //人员账号信息
+        PersonAccount personAccount= personAccountService.getOne(wrapper5);
+        personDto.setPersonUser(personUser);
+        personDto.setPersonCertificate(personCertificate);
+        personDto.setPersonAccount(personAccount);
+        return personDto;
+    }
+
+    @Transactional
+    public int deletePerson(String [] ids) {
+        return personBasicMapper.deleteList(ids);
+    }
 
     //新增平台用户
-    private ResponseModel<Object> setcreateUser(UserDto userDto,String appKey, String product, String token){
-        return    privilegeFeignClient.create(appKey, product, token,userDto);
+    private ResponseModel<Object> setcreateUser(UserDto userDto, String appKey, String product, String token) {
+        return privilegeFeignClient.create(appKey, product, token, userDto);
     }
 
     //修改平台用户
-    private ResponseModel<Object> update(String userId ,UserDto userDto,String appKey, String product, String token){
-        return privilegeFeignClient.update(userId,appKey, product, token,userDto);
+    private ResponseModel<Object> update(String userId, UserDto userDto, String appKey, String product, String token) {
+        return privilegeFeignClient.update(userId, appKey, product, token, userDto);
     }
 
 
@@ -124,6 +200,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
                                            String name,
                                            String accountName,
                                            String projectName)   {
+
         List<UserMapperDto> list=personBasicMapper.queryPage((page.getCurrent()-1) * page.getSize(),page.getSize(),  name,
                 accountName,
                 projectName);