力量调派记录列表接口修改

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransfer.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -60,6 +62,7 @@ public class PowerTransfer extends BaseEntity {
     @ApiModelProperty(value = "车坐标y")
     private String carCoordinateY;
 
+    @TableField(value = "REC_USER_NAME", fill = FieldFill.INSERT_UPDATE)
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompany.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -43,6 +41,7 @@ public class PowerTransferCompany extends BaseEntity {
     @ApiModelProperty(value = "任务信息")
     private String taskInformation;
 
+    @TableField(value = "REC_USER_NAME", fill = FieldFill.INSERT_UPDATE)
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompanyResources.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -42,6 +40,7 @@ public class PowerTransferCompanyResources extends BaseEntity {
     @ApiModelProperty(value = "资源编号（如车牌号）")
     private String resourcesNum;
 
+    @TableField(value = "REC_USER_NAME", fill = FieldFill.INSERT_UPDATE)
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerTransferListMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -17,9 +16,5 @@ import java.util.List;
 @Mapper
 public interface PowerTransferListMapper extends BaseMapper<PowerTransferListVo> {
 
-    @Select("select ptc.company_name,ptcr.type,resources_num from jc_power_transfer_company_resources ptcr\n" +
-            "inner join jc_power_transfer_company ptc on ptcr.power_transfer_company_id = ptc.sequence_nbr\n" +
-            "inner join jc_power_transfer pt on ptc.power_transfer_id = pt.sequence_nbr\n" +
-            "where pt.alert_called_id = #{alertCalledId} order by ptcr.sequence_nbr desc")
     List<PowerTransferListVo> getPowerTransferList(Long alertCalledId);
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferListMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferListMapper">
+
+    <select id="getPowerTransferList" resultType="com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo">
+        select company_name,type,resources_num
+        from (
+                 select ptc.company_name, ptcr.type, ptcr.resources_num, ptcr.rec_date
+                 from jc_power_transfer_company ptc
+                          left join jc_power_transfer pt on ptc.power_transfer_id = pt.sequence_nbr
+                          right join jc_power_transfer_company_resources ptcr
+                                     on ptcr.power_transfer_company_id = ptc.sequence_nbr
+                 where pt.alert_called_id = #{alertCalledId}
+                   and ptc.is_distribution_agencies = 0
+                 union all
+                 select ptc.company_name, "" type, "" resources_num, ptc.rec_date
+                 from jc_power_transfer_company ptc
+                          left join jc_power_transfer pt on ptc.power_transfer_id = pt.sequence_nbr
+                 where pt.alert_called_id = #{alertCalledId}
+                   and ptc.is_distribution_agencies = 1
+             ) jcpt
+        order by rec_date desc
+    </select>
+</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferController.java

@@ -50,18 +50,8 @@ public class PowerTransferController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增力量调派", notes = "新增力量调派")
-    public ResponseModel<Object> savePowerTransfer(@RequestBody PowerTransferDto powerTransferDto) {
-//        AgencyUserModel userInfo = getUserInfo();
-//        powerTransferdto.setRecUserId(userInfo.getUserId());
-//        powerTransferdto.setRecUserName(userInfo.getUserName());
-//        powerTransferdto.setRecDate(new Date());
-//        boolean save = iPowerTransferService.createPowerTransfer(powerTransferDto);
-
-        PowerTransfer powerTransfer = new PowerTransfer();
-        BeanUtils.copyProperties(powerTransferDto,powerTransfer);
-
-        boolean save = iPowerTransferService.save(powerTransfer);
-        return CommonResponseUtil.success(save);
+    public boolean savePowerTransfer(@RequestBody PowerTransfer powerTransfer) {
+        return iPowerTransferService.save(powerTransfer);
     }
 
     /**
@@ -164,7 +154,25 @@ public class PowerTransferController extends BaseController {
 
         List<PowerTransferListVo> powerTransferList =
                 iPowerTransferService.getPowerTransferList(Long.parseLong(alert_called_id));
+
         return CommonResponseUtil.success(powerTransferList);
     }
+
+    /**
+     * 力量调派-任务派发
+     *
+     * @return 返回结果
+     */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/create", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "力量调派-任务派发", notes = "力量调派-任务派发")
+    public ResponseModel<Object> createPowerTransfer(@RequestBody PowerTransferDto powerTransferDto) {
+        AgencyUserModel userInfo = getUserInfo();
+        powerTransferDto.setRecUserId(userInfo.getUserId());
+        powerTransferDto.setRecUserName(userInfo.getUserName());
+
+        boolean save = iPowerTransferService.createPowerTransfer(powerTransferDto);
+        return CommonResponseUtil.success(save);
+    }
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -22,7 +22,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 力量调派 服务实现类
@@ -65,8 +67,8 @@ public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, P
         powerTransfer.setAlertCalledId(alertCalledId);
         powerTransfer.setDispatchNum(dispatch_num);
         powerTransfer.setDispatchType(powerTransferDto.getDispatchType());
-        powerTransfer.setTaskSenderName(powerTransferDto.getTaskSenderName());
-        powerTransfer.setTaskSenderId(powerTransferDto.getTaskSenderId());
+        powerTransfer.setTaskSenderName(powerTransferDto.getRecUserName());
+        powerTransfer.setTaskSenderId(Long.parseLong(powerTransferDto.getRecUserId()));
         powerTransfer.setAddress(alertCalled.getAddress());
         powerTransfer.setCoordinateX(alertCalled.getCoordinateX());
         powerTransfer.setCoordinateY(alertCalled.getCoordinateY());
@@ -74,16 +76,17 @@ public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, P
         powerTransfer.setCarAddress(alertCalled.getAddress());
         powerTransfer.setCarCoordinateX(alertCalled.getCoordinateX());
         powerTransfer.setCarCoordinateY(alertCalled.getCoordinateY());
-        powerTransfer.setRecUserId(powerTransferDto.getRecUserId());
-        powerTransfer.setRecUserName(powerTransferDto.getRecUserName());
-        boolean b = save(powerTransfer);
+
+        save(powerTransfer);
         Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
         // 创建力量调派单位
         List<PowerTransferCompanyDto> powerTransferCompanyDotList = powerTransferDto.getPowerTransferCompanyDotList();
-        PowerTransferCompany powerTransferCompany = null;
+        PowerTransferCompany powerTransferCompany;
         // 获取任务派发模板
 
+
         for (PowerTransferCompanyDto powerTransferCompanyDto : powerTransferCompanyDotList) {
+            powerTransferCompany = new PowerTransferCompany();
             BeanUtils.copyProperties(powerTransferCompanyDto, powerTransferCompany);
             powerTransferCompany.setPowerTransferId(powerTransferSequenceNbr);
             List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList =
@@ -105,8 +108,9 @@ public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, P
 
     private List<PowerTransferCompanyResources> DtoEntityBatchConvert(List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList, Long powerTransferCompanySequenceNbr) {
         ArrayList<PowerTransferCompanyResources> powerTransferCompanyResourcesList = new ArrayList<>();
-        PowerTransferCompanyResources powerTransferCompanyResources = null;
+        PowerTransferCompanyResources powerTransferCompanyResources;
         for (PowerTransferCompanyResourcesDto powerTransferCompanyResourcesDto : powerTransferCompanyResourcesDtoList) {
+            powerTransferCompanyResources = new PowerTransferCompanyResources();
             BeanUtils.copyProperties(powerTransferCompanyResourcesDto, powerTransferCompanyResources);
             powerTransferCompanyResources.setPowerTransferCompanyId(powerTransferCompanySequenceNbr);
             powerTransferCompanyResourcesList.add(powerTransferCompanyResources);