修改接口

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -520,19 +520,19 @@ public class DateUtils {
         return dateParse(dateFormat(date, MONTH_PATTERN) + "-" + value, null);
     }
 
-//    public static void main(String[] args) throws Exception {
-//        /*System.out.println(dateTimeToDate(new Date()));
-//        System.out.println(dateParse("2017-02-04 14:58:20", null));
-//        System.out.println(dateTimeToDateStringIfTimeEndZero(new Date()));
-//        System.out.println(dateTimeToDateStringIfTimeEndZero(dateTimeToDate(new Date())));*/
-//        //System.out.println(dateBetween(dateParse("2017-01-30", null), dateParse("2017-02-01", null)));
-//        //System.out.println(dateBetweenIncludeToday(dateParse("2017-01-30", null), dateParse("2017-02-01", null)));
-//        System.out.println(getDate(dateParse("2017-01-17", null)));
-//        /*
-//        System.out.println(getDaysOfMonth(dateParse("2017-02-01", null)));
-//        System.out.println(getDaysOfYear(dateParse("2017-01-30", null)));*/
-//        //System.out.println(dateFormat(dateAddMonths(dateParse("2017-02-07", StrUtils.MONTH_PATTERN), -12), StrUtils.MONTH_PATTERN));
-//        /*System.out.println(dateFormat(maxDateOfMonth(dateParse("2016-02", "yyyy-MM")), null));
-//        System.out.println(dateFormat(minDateOfMonth(dateParse("2016-03-31", null)), null));*/
-//    }
+    public static void main(String[] args) throws Exception {
+        /*System.out.println(dateTimeToDate(new Date()));
+        System.out.println(dateParse("2017-02-04 14:58:20", null));
+        System.out.println(dateTimeToDateStringIfTimeEndZero(new Date()));
+        System.out.println(dateTimeToDateStringIfTimeEndZero(dateTimeToDate(new Date())));*/
+        //System.out.println(dateBetween(dateParse("2017-01-30", null), dateParse("2017-02-01", null)));
+        //System.out.println(dateBetweenIncludeToday(dateParse("2017-01-30", null), dateParse("2017-02-01", null)));
+        System.out.println(getDate(dateParse("2017-01-17", null)));
+        /*
+        System.out.println(getDaysOfMonth(dateParse("2017-02-01", null)));
+        System.out.println(getDaysOfYear(dateParse("2017-01-30", null)));*/
+        //System.out.println(dateFormat(dateAddMonths(dateParse("2017-02-07", StrUtils.MONTH_PATTERN), -12), StrUtils.MONTH_PATTERN));
+        /*System.out.println(dateFormat(maxDateOfMonth(dateParse("2016-02", "yyyy-MM")), null));
+        System.out.println(dateFormat(minDateOfMonth(dateParse("2016-03-31", null)), null));*/
+    }
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java

@@ -85,7 +85,7 @@ public class MyBatisPlusCodeGenerator {
         throw new MybatisPlusException("请输入正确的" + tip + "！");
     }
 
-    public static void main1(String[] args) {
+    public static void main(String[] args) {
         // 代码生成器
         AutoGenerator autoGenerator = new AutoGenerator();
 

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java

 package com.yeejoin.amos.boot.biz.config;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
-import java.util.Date;
-import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import java.util.Date;
 
 
 @Component
@@ -47,8 +47,13 @@ public class MetaHandler  implements MetaObjectHandler {
 
 	private void autoFillUser(MetaObject metaObject) {
 		//获取用户信息 以及当前用户登录公司部门，角色
-		ReginParams reginParams=JSONObject.parseObject(redisUtils.get(buildKey( getToken())).toString(), ReginParams.class);		
-		AgencyUserModel agencyUserModel=reginParams.getUserModel();	
+		ReginParams reginParams =
+				JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
+						redisUtils.get(buildKey(getToken())).toString() : "", ReginParams.class);
+		if (ObjectUtils.isEmpty(reginParams)) {
+			return;
+		}
+		AgencyUserModel agencyUserModel = reginParams.getUserModel();
 
 		if(ObjectUtils.isEmpty(reginParams)||ObjectUtils.isEmpty(agencyUserModel)){
 			return;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferCompanyDto.java

@@ -12,6 +12,9 @@ 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;
+
+import java.util.List;
+
 /**
 * 调派单位
 *
@@ -45,4 +48,7 @@ public class PowerTransferCompanyDto extends BaseEntity {
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 
+    @ApiModelProperty(value = "调派单位资源列表")
+    private List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferDto.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,6 +13,9 @@ 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;
+
+import java.util.List;
+
 /**
 * 力量调派
 *
@@ -66,4 +70,7 @@ public class PowerTransferDto extends BaseEntity {
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 
+    @ApiModelProperty(value = "调派单位列表")
+    private List<PowerTransferCompanyDto> powerTransferCompanyDotList;
+
 }

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;
@@ -7,11 +9,7 @@ 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;
+
 /**
 * 力量调派
 *
@@ -64,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/AlertSubmittedMapper.java

@@ -16,10 +16,18 @@ import java.util.List;
 */
 public interface AlertSubmittedMapper extends BaseMapper<AlertSubmitted> {
     /**
-     * 根据参数获取警情报送/融合调度列表
+     * 根据参数获取融合调度列表
      *
      * @param alertSubmittedDto
      * @return
      */
-    List<AlertSubmittedExtVo> listByParam(@Param("alertSubmittedDto") AlertSubmittedDto alertSubmittedDto);
+    List<AlertSubmittedExtVo> listSchedulingByParam(@Param("alertSubmittedDto") AlertSubmittedDto alertSubmittedDto);
+
+    /**
+     * 根据参数获取警情报送列表
+     *
+     * @param alertSubmittedDto
+     * @return
+     */
+    List<AlertSubmittedExtVo> listReportingByParam(@Param("alertSubmittedDto") AlertSubmittedDto alertSubmittedDto);
 }

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

@@ -33,7 +33,7 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
 + "<if test='par.state!=null'>" + "and a.state_code= #{par.state}" + "</if>"
 + "<if test='par.fireTeamId!=null'>" + "and a.fire_team_id= #{par.fireTeamId}" + "</if>"
 + "<if test='par.jobTitle!=null'>" + "and a.job_title_code =#{par.jobTitle}" + "</if>"
-+" limit 0,#{pageSize}"
++" limit #{pageNum},#{pageSize}"
 + "</script>")	 
 List<Firefighters>getFirefighters(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FirefightersListVo par);
 @Select("<script>"

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

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+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 java.util.List;
+
+/**
+ * @title: PowerTransferListMapper
+ * @Author fpy
+ * @Date: 2021/6/18 13:48
+ * @Version 1.0
+ */
+@Mapper
+public interface PowerTransferListMapper extends BaseMapper<PowerTransferListVo> {
+
+    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/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertSubmittedService.java

@@ -14,10 +14,18 @@ import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
 public interface IAlertSubmittedService extends IService<AlertSubmitted> {
 
     /**
-     * 根据参数查询警情报送/融合调度记录
+     * 根据参数查询融合调度记录
      *
      * @param queryParam
      * @return SchedulingReportingVo
      */
-    SchedulingReportingVo listByParam(AlertSubmittedDto queryParam);
+    SchedulingReportingVo listSchedulingByParam(AlertSubmittedDto queryParam);
+
+    /**
+     * 根据参数查询警情报送记录
+     *
+     * @param queryParam
+     * @return SchedulingReportingVo
+     */
+    SchedulingReportingVo listReportingByParam(AlertSubmittedDto queryParam);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo;
+
+import java.util.List;
 
 /**
 * 力量调派 服务类
@@ -11,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface IPowerTransferService extends IService<PowerTransfer> {
 
+    List<PowerTransferListVo> getPowerTransferList(Long alertCalledId);
+
+    boolean createPowerTransfer(PowerTransferDto powerTransferDto);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/PowerTransferListVo.java

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @title: PowerTransferListVo
+ * @Author fpy
+ * @Date: 2021/6/18 12:01
+ * @Version 1.0
+ */
+@Data
+@EqualsAndHashCode()
+@Accessors(chain = true)
+@ApiModel(value="PowerTransfer对象", description="力量调派")
+public class PowerTransferListVo {
+
+    @ApiModelProperty(value = " 单位名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "资源类型")
+    private String type;
+
+    @ApiModelProperty(value = "资源编号（如车牌号）")
+    private String resourcesNum;
+}
\ No newline at end of file

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

@@ -2,7 +2,7 @@
 <!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.AlertSubmittedMapper">
 
-    <select id="listByParam" resultType="com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo">
+    <select id="listSchedulingByParam" resultType="com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo">
         select
         jas.sequence_nbr alertSubmittedId,
         jas.alert_called_id,
@@ -32,4 +32,34 @@
             and jas.business_type_code = #{alertSubmittedDto.businessTypeCode}
         </if>
     </select>
+    <select id="listReportingByParam" resultType="com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo">
+        select
+        jas.sequence_nbr alertSubmittedId,
+        jas.alert_called_id,
+        jas.business_type,
+        jas.business_type_code,
+        jas.scheduling_type,
+        jas.scheduling_type_code,
+        jas.submission_time,
+        jas.submission_content,
+        jas.submission_method,
+        jas.submission_method_code,
+        jas.update_time,
+        jaso.sequence_nbr,
+        group_concat(jaso.company_name) companyNames,
+        group_concat(jaso.user_name) userNames
+        from jc_alert_submitted jas
+        left join jc_alert_submitted_object jaso on jas.sequence_nbr = jaso.alert_submitted_id
+        where 1=1
+        <if test="alertSubmittedDto.alertCalledId != null and alertSubmittedDto.alertCalledId != ''">
+            and jas.alert_called_id = #{alertSubmittedDto.alertCalledId}
+        </if>
+        <if test="alertSubmittedDto.submissionMethodCode != null and alertSubmittedDto.submissionMethodCode != ''">
+            and jas.submission_method_code = #{alertSubmittedDto.submissionMethodCode}
+        </if>
+        <if test="alertSubmittedDto.businessTypeCode != null and alertSubmittedDto.businessTypeCode != ''">
+            and jas.business_type_code = #{alertSubmittedDto.businessTypeCode}
+        </if>
+        group by jaso.alert_submitted_id
+    </select>
 </mapper>

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/AlertCalledController.java

@@ -52,7 +52,7 @@ public class AlertCalledController extends BaseController {
 	 * 
 	 * @return
 	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "新增警情接警记录", notes = "新增警情接警记录")
 	@Transactional
@@ -86,7 +86,7 @@ public class AlertCalledController extends BaseController {
 	 * @param id
 	 * @return
 	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
 	@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
 	public boolean deleteById(HttpServletRequest request, @PathVariable Long id) {
@@ -98,7 +98,7 @@ public class AlertCalledController extends BaseController {
 	 * 
 	 * @return
 	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
 	@ApiOperation(httpMethod = "PUT", value = "修改警情接警记录", notes = "修改警情接警记录")
 	public boolean updateByIdAlertCalled(HttpServletRequest request, @RequestBody AlertCalled alertCalled) {
@@ -111,7 +111,7 @@ public class AlertCalledController extends BaseController {
 	 * @param id
 	 * @return
 	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
 	public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) {
@@ -130,7 +130,7 @@ public class AlertCalledController extends BaseController {
 	 * 
 	 * @return
 	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
 	public ResponseModel listPage(String pageNum, String pageSize, AlertCalled alertCalled) {
@@ -183,7 +183,7 @@ public class AlertCalledController extends BaseController {
 	 * 
 	 * @return
 	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/getList", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "列表无分页查询", notes = "列表无分页查询")
 	public ResponseModel list(AlertCalled alertCalled) {

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

@@ -45,7 +45,7 @@ public class AlertFormController extends BaseController {
     * 新增警情表单
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增警情表单", notes = "新增警情表单")
     public boolean saveAlertForm(HttpServletRequest request, @RequestBody AlertForm alertForm){
@@ -57,7 +57,7 @@ public class AlertFormController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
@@ -71,7 +71,7 @@ public class AlertFormController extends BaseController {
     * 修改警情表单
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改警情表单", notes = "修改警情表单")
     public boolean updateByIdAlertForm(HttpServletRequest request, @RequestBody AlertForm alertForm){
@@ -85,7 +85,7 @@ public class AlertFormController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public AlertForm selectById(HttpServletRequest request, @PathVariable Long id){
@@ -100,8 +100,9 @@ public class AlertFormController extends BaseController {
      * @param id
      * @return
      */
-     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-     @RequestMapping(value = "/Form/{code}", method = RequestMethod.GET)
+
+     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+     @RequestMapping(value = "/from/{code}", method = RequestMethod.GET)
      @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
      public ResponseModel selectFormdItem(HttpServletRequest request, @PathVariable String code){
     	 QueryWrapper queryWrapper = new QueryWrapper<>();
@@ -125,7 +126,7 @@ public class AlertFormController extends BaseController {
     * 列表分页查询
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<AlertForm> listPage(String pageNum,String pageSize, AlertForm alertForm){

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

@@ -39,7 +39,7 @@ public class AlertFormTypeController extends BaseController {
     * 新增动态表单类型
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增动态表单类型", notes = "新增动态表单类型")
     public boolean saveAlertFormType(HttpServletRequest request, @RequestBody AlertFormType alertFormType){
@@ -51,7 +51,7 @@ public class AlertFormTypeController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
@@ -65,7 +65,7 @@ public class AlertFormTypeController extends BaseController {
     * 修改动态表单类型
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改动态表单类型", notes = "修改动态表单类型")
     public boolean updateByIdAlertFormType(HttpServletRequest request, @RequestBody AlertFormType alertFormType){
@@ -79,7 +79,7 @@ public class AlertFormTypeController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public AlertFormType selectById(HttpServletRequest request, @PathVariable Long id){
@@ -92,7 +92,7 @@ public class AlertFormTypeController extends BaseController {
     * 列表分页查询
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<AlertFormType> listPage(String pageNum,String pageSize, AlertFormType alertFormType){

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

@@ -39,7 +39,7 @@ public class AlertFormValueController extends BaseController {
     * 新增
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public boolean saveAlertFormValue(HttpServletRequest request, @RequestBody AlertFormValue alertFormValue){
@@ -51,7 +51,7 @@ public class AlertFormValueController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
@@ -65,7 +65,7 @@ public class AlertFormValueController extends BaseController {
     * 修改
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
     public boolean updateByIdAlertFormValue(HttpServletRequest request, @RequestBody AlertFormValue alertFormValue){
@@ -79,7 +79,7 @@ public class AlertFormValueController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public AlertFormValue selectById(HttpServletRequest request, @PathVariable Long id){
@@ -92,7 +92,7 @@ public class AlertFormValueController extends BaseController {
     * 列表分页查询
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<AlertFormValue> listPage(String pageNum,String pageSize, AlertFormValue alertFormValue){

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

@@ -44,7 +44,7 @@ public class AlertSubmittedController extends BaseController {
     * 新增警情报送记录
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增警情报送记录", notes = "新增警情报送记录")
     public ResponseModel saveAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){
@@ -56,7 +56,7 @@ public class AlertSubmittedController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id){
@@ -70,7 +70,7 @@ public class AlertSubmittedController extends BaseController {
     * 修改警情报送记录
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改警情报送记录", notes = "修改警情报送记录")
     public ResponseModel updateByIdAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){
@@ -84,7 +84,7 @@ public class AlertSubmittedController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id){
@@ -92,17 +92,24 @@ public class AlertSubmittedController extends BaseController {
     }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/schedulingReporting/list", method = RequestMethod.POST)
-    @ApiOperation(httpMethod = "POST", value = "根据警情id查询融合调度、警情报送列表", notes = "根据警情id查询融合调度、警情报送列表")
-    public ResponseModel listByParam(@RequestBody AlertSubmittedDto queryParam) {
-        return CommonResponseUtil.success(iAlertSubmittedService.listByParam(queryParam));
+    @RequestMapping(value = "/scheduling/list", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "根据警情id查询融合调度列表", notes = "根据警情id查询融合调度列表")
+    public ResponseModel listSchedulingByParam(@RequestBody AlertSubmittedDto queryParam) {
+        return CommonResponseUtil.success(iAlertSubmittedService.listSchedulingByParam(queryParam));
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/reporting/list", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "根据警情id查询警情报送列表", notes = "根据警情id查询警情报送列表")
+    public ResponseModel listReportingByParam(@RequestBody AlertSubmittedDto queryParam) {
+        return CommonResponseUtil.success(iAlertSubmittedService.listReportingByParam(queryParam));
     }
 
     /**
     * 列表分页查询
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<AlertSubmitted> listPage(String pageNum, String pageSize, AlertSubmitted alertSubmitted) {

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

@@ -39,7 +39,7 @@ public class AlertSubmittedObjectController extends BaseController {
     * 新增报送对象
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增报送对象", notes = "新增报送对象")
     public boolean saveAlertSubmittedObject(HttpServletRequest request, @RequestBody AlertSubmittedObject alertSubmittedObject){
@@ -51,7 +51,7 @@ public class AlertSubmittedObjectController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
@@ -65,7 +65,7 @@ public class AlertSubmittedObjectController extends BaseController {
     * 修改报送对象
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改报送对象", notes = "修改报送对象")
     public boolean updateByIdAlertSubmittedObject(HttpServletRequest request, @RequestBody AlertSubmittedObject alertSubmittedObject){
@@ -79,7 +79,7 @@ public class AlertSubmittedObjectController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public AlertSubmittedObject selectById(HttpServletRequest request, @PathVariable Long id){
@@ -92,7 +92,7 @@ public class AlertSubmittedObjectController extends BaseController {
     * 列表分页查询
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<AlertSubmittedObject> listPage(String pageNum,String pageSize, AlertSubmittedObject alertSubmittedObject){

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

@@ -48,7 +48,7 @@ public class DataDictionaryController extends BaseController {
     * 新增数据字典
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增数据字典", notes = "新增数据字典")
     public boolean saveDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary){
@@ -60,7 +60,7 @@ public class DataDictionaryController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
@@ -74,7 +74,7 @@ public class DataDictionaryController extends BaseController {
     * 修改数据字典
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改数据字典", notes = "修改数据字典")
     public boolean updateByIdDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary){
@@ -88,7 +88,7 @@ public class DataDictionaryController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public DataDictionary selectById(HttpServletRequest request, @PathVariable Long id){
@@ -101,7 +101,7 @@ public class DataDictionaryController extends BaseController {
     * 列表分页查询
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<DataDictionary> listPage(String pageNum,String pageSize, DataDictionary dataDictionary){

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

@@ -34,7 +34,7 @@ public class DemoController extends BaseController {
 	@Autowired
 	private IDemoService demoService;
 
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/user")
     @ApiOperation(value = "cs1")
     public ResponseModel<Object> findUserList() {
@@ -42,7 +42,7 @@ public class DemoController extends BaseController {
         return CommonResponseUtil.success(lists);
     }
 
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/demo/{seqNbr}")
     @ApiOperation(value = "cs2")
     public ResponseModel findOneBySeqNbr(@PathVariable("seqNbr") Long seqNbr) {

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

@@ -220,8 +220,8 @@ public class FirefightersController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "新列表分页查询", notes = "新表分页查询")
     public ResponseModel getFirefighters(Integer pageNum,Integer pageSize, FirefightersListVo firefighters){
          //条件分页
-    	 List<Firefighters> list= iFirefightersService.getFirefighters(pageNum, pageSize, firefighters);
-    	 Map<String, Long> num= iFirefightersService.getFirefightersCount(pageNum, pageSize, firefighters);   	
+    	 List<Firefighters> list= iFirefightersService.getFirefighters((pageNum - 1) * pageSize, pageSize, firefighters);
+    	 Map<String, Long> num= iFirefightersService.getFirefightersCount((pageNum - 1) * pageSize, pageSize, firefighters);
     	 Page<Firefighters> pageBean =new Page<>(pageNum, pageSize,num.get("num"));
     	 pageBean.setRecords(list);
     	 return CommonResponseUtil.success(pageBean);  	 

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

@@ -39,7 +39,7 @@ public class OrgUsrAuthController extends BaseController {
     * 新增
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public boolean saveOrgUsrAuth(HttpServletRequest request, @RequestBody OrgUsrAuth orgUsrAuth){
@@ -51,7 +51,7 @@ public class OrgUsrAuthController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
@@ -65,7 +65,7 @@ public class OrgUsrAuthController extends BaseController {
     * 修改
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
     public boolean updateByIdOrgUsrAuth(HttpServletRequest request, @RequestBody OrgUsrAuth orgUsrAuth){
@@ -79,7 +79,7 @@ public class OrgUsrAuthController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public OrgUsrAuth selectById(HttpServletRequest request, @PathVariable Long id){
@@ -92,7 +92,7 @@ public class OrgUsrAuthController extends BaseController {
     * 列表分页查询
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<OrgUsrAuth> listPage(String pageNum,String pageSize, OrgUsrAuth orgUsrAuth){

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

@@ -39,7 +39,7 @@ public class OrgUsrController extends BaseController {
     * 新增机构/部门/人员表
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增机构/部门/人员表", notes = "新增机构/部门/人员表")
     public boolean saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsr orgUsr){
@@ -51,7 +51,7 @@ public class OrgUsrController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
@@ -65,7 +65,7 @@ public class OrgUsrController extends BaseController {
     * 修改机构/部门/人员表
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改机构/部门/人员表", notes = "修改机构/部门/人员表")
     public boolean updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsr orgUsr){
@@ -79,7 +79,7 @@ public class OrgUsrController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public OrgUsr selectById(HttpServletRequest request, @PathVariable Long id){
@@ -92,7 +92,7 @@ public class OrgUsrController extends BaseController {
     * 列表分页查询
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<OrgUsr> listPage(String pageNum,String pageSize, OrgUsr orgUsr){

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

@@ -39,7 +39,7 @@ public class PowerTransferCompanyController extends BaseController {
     * 新增调派单位
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增调派单位", notes = "新增调派单位")
     public boolean savePowerTransferCompany(HttpServletRequest request, @RequestBody PowerTransferCompany powerTransferCompany){
@@ -51,7 +51,7 @@ public class PowerTransferCompanyController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
@@ -65,7 +65,7 @@ public class PowerTransferCompanyController extends BaseController {
     * 修改调派单位
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改调派单位", notes = "修改调派单位")
     public boolean updateByIdPowerTransferCompany(HttpServletRequest request, @RequestBody PowerTransferCompany powerTransferCompany){
@@ -79,7 +79,7 @@ public class PowerTransferCompanyController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public PowerTransferCompany selectById(HttpServletRequest request, @PathVariable Long id){
@@ -92,7 +92,7 @@ public class PowerTransferCompanyController extends BaseController {
     * 列表分页查询
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<PowerTransferCompany> listPage(String pageNum,String pageSize, PowerTransferCompany powerTransferCompany){

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

@@ -39,7 +39,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
     * 新增调派单位资源
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增调派单位资源", notes = "新增调派单位资源")
     public boolean savePowerTransferCompanyResources(HttpServletRequest request, @RequestBody PowerTransferCompanyResources powerTransferCompanyResources){
@@ -51,7 +51,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
@@ -65,7 +65,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
     * 修改调派单位资源
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改调派单位资源", notes = "修改调派单位资源")
     public boolean updateByIdPowerTransferCompanyResources(HttpServletRequest request, @RequestBody PowerTransferCompanyResources powerTransferCompanyResources){
@@ -79,7 +79,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public PowerTransferCompanyResources selectById(HttpServletRequest request, @PathVariable Long id){
@@ -92,7 +92,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
     * 列表分页查询
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<PowerTransferCompanyResources> listPage(String pageNum,String pageSize, PowerTransferCompanyResources powerTransferCompanyResources){

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
+
+import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
+import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
 import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,15 +21,18 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import java.util.Arrays;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 /**
-* 力量调派
-*
-* @author tb
-* @date 2021-06-17
-*/
+ * 力量调派
+ *
+ * @author tb
+ * @date 2021-06-17
+ */
 @RestController
 @Api(tags = "力量调派Api")
 @RequestMapping(value = "/jcs/power-transfer")
@@ -35,67 +41,68 @@ public class PowerTransferController extends BaseController {
     @Autowired
     IPowerTransferService iPowerTransferService;
 
+
     /**
      * 新增力量调派
-    * @return
+     *
+     * @return 返回结果
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增力量调派", notes = "新增力量调派")
-    public boolean savePowerTransfer(HttpServletRequest request, @RequestBody PowerTransfer powerTransfer){
+    public boolean savePowerTransfer(@RequestBody PowerTransfer powerTransfer) {
         return iPowerTransferService.save(powerTransfer);
     }
 
     /**
      * 根据id删除
-    * @param id
-    * @return
+     *
+     * @param id id
+     * @return 返回结果
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
+    public boolean deleteById(@PathVariable Long id) {
         return iPowerTransferService.removeById(id);
     }
 
 
-
-
     /**
      * 修改力量调派
-    * @return
+     *
+     * @return 返回结果
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改力量调派", notes = "修改力量调派")
-    public boolean updateByIdPowerTransfer(HttpServletRequest request, @RequestBody PowerTransfer powerTransfer){
+    public boolean updateByIdPowerTransfer(@RequestBody PowerTransfer powerTransfer) {
         return iPowerTransferService.updateById(powerTransfer);
     }
 
 
-
     /**
      * 根据id查询
-    * @param id
-    * @return
+     *
+     * @param id id
+     * @return 返回结果
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-    public PowerTransfer selectById(HttpServletRequest request, @PathVariable Long id){
+    public PowerTransfer selectById(@PathVariable Long id) {
         return iPowerTransferService.getById(id);
     }
 
-
-
     /**
      * 列表分页查询
-    * @return
+     *
+     * @return 返回结果
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public IPage<PowerTransfer> listPage(String pageNum,String pageSize, PowerTransfer powerTransfer){
+    public IPage<PowerTransfer> listPage(String pageNum, String pageSize, PowerTransfer powerTransfer) {
 
         Page<PowerTransfer> pageBean;
         QueryWrapper<PowerTransfer> powerTransferQueryWrapper = new QueryWrapper<>();
@@ -122,7 +129,7 @@ public class PowerTransferController extends BaseController {
                     }
                 }
             } catch (Exception e) {
-                throw  new RuntimeException("系统异常");
+                e.printStackTrace();
             }
         });
         IPage<PowerTransfer> page;
@@ -134,5 +141,38 @@ public class PowerTransferController extends BaseController {
         page = iPowerTransferService.page(pageBean, powerTransferQueryWrapper);
         return page;
     }
+
+    /**
+     * 根据警情id获取力量调派列表
+     *
+     * @return 返回结果
+     */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/list/{alert_called_id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据警情id获取力量调派列表", notes = "根据警情id获取力量调派列表")
+    public ResponseModel<Object> list(@PathVariable String alert_called_id) {
+
+        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/controller/TemplateController.java

@@ -39,7 +39,7 @@ public class TemplateController extends BaseController {
     * 新增模板表
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增模板表", notes = "新增模板表")
     public boolean saveTemplate(HttpServletRequest request, @RequestBody Template template){
@@ -51,7 +51,7 @@ public class TemplateController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
@@ -65,7 +65,7 @@ public class TemplateController extends BaseController {
     * 修改模板表
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改模板表", notes = "修改模板表")
     public boolean updateByIdTemplate(HttpServletRequest request, @RequestBody Template template){
@@ -79,7 +79,7 @@ public class TemplateController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public Template selectById(HttpServletRequest request, @PathVariable Long id){
@@ -92,7 +92,7 @@ public class TemplateController extends BaseController {
     * 列表分页查询
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<Template> listPage(String pageNum,String pageSize, Template template){

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper;
@@ -22,12 +21,22 @@ import java.util.List;
 public class AlertSubmittedServiceImpl extends ServiceImpl<AlertSubmittedMapper, AlertSubmitted> implements IAlertSubmittedService {
 
     @Override
-    public SchedulingReportingVo listByParam(AlertSubmittedDto queryParam) {
+    public SchedulingReportingVo listSchedulingByParam(AlertSubmittedDto queryParam) {
         SchedulingReportingVo schedulingReportingVo = new SchedulingReportingVo();
-        List<AlertSubmittedExtVo> alertSubmittedExtVoList = this.baseMapper.listByParam(queryParam);
+        List<AlertSubmittedExtVo> alertSubmittedExtVoList = this.baseMapper.listSchedulingByParam(queryParam);
         schedulingReportingVo.setSchedulingReportingList(alertSubmittedExtVoList);
         String extraInfo = "已调度电话" + alertSubmittedExtVoList.size() + "起";
         schedulingReportingVo.setExtraInfo(extraInfo);
         return schedulingReportingVo;
     }
+
+    @Override
+    public SchedulingReportingVo listReportingByParam(AlertSubmittedDto queryParam) {
+        SchedulingReportingVo schedulingReportingVo = new SchedulingReportingVo();
+        List<AlertSubmittedExtVo> alertSubmittedExtVoList = this.baseMapper.listReportingByParam(queryParam);
+        schedulingReportingVo.setSchedulingReportingList(alertSubmittedExtVoList);
+        String extraInfo = "已报送" + alertSubmittedExtVoList.size() + "条";
+        schedulingReportingVo.setExtraInfo(extraInfo);
+        return schedulingReportingVo;
+    }
 }

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferListMapper;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourcesService;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyService;
 import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 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;
 
 /**
-* 力量调派 服务实现类
-*
-* @author tb
-* @date 2021-06-17
-*/
+ * 力量调派 服务实现类
+ *
+ * @author tb
+ * @date 2021-06-17
+ */
 @Service
 public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, PowerTransfer> implements IPowerTransferService {
 
+    @Autowired
+    PowerTransferListMapper powerTransferListMapper;
+
+    @Autowired
+    IAlertCalledService iAlertCalledService;
+
+    @Autowired
+    IPowerTransferCompanyService iPowerTransferCompanyService;
+
+    @Autowired
+    IPowerTransferCompanyResourcesService iPowerTransferCompanyResourcesService;
+
+    public List<PowerTransferListVo> getPowerTransferList(Long alertCalledId) {
+        return powerTransferListMapper.getPowerTransferList(alertCalledId);
+    }
+
+    @Override
+    @Transactional
+    public boolean createPowerTransfer(PowerTransferDto powerTransferDto) {
+        // 获取调派ID
+        Long alertCalledId = powerTransferDto.getAlertCalledId();
+        int count = count(new QueryWrapper<PowerTransfer>().eq("alert_called_id", alertCalledId));
+        String dispatch_num = alertCalledId.toString() + (count + 1);
+
+        // 获取警情详情
+        AlertCalled alertCalled = iAlertCalledService.getById(alertCalledId);
+
+        // 创建力量调派
+        PowerTransfer powerTransfer = new PowerTransfer();
+        powerTransfer.setAlertCalledId(alertCalledId);
+        powerTransfer.setDispatchNum(dispatch_num);
+        powerTransfer.setDispatchType(powerTransferDto.getDispatchType());
+        powerTransfer.setTaskSenderName(powerTransferDto.getRecUserName());
+        powerTransfer.setTaskSenderId(Long.parseLong(powerTransferDto.getRecUserId()));
+        powerTransfer.setAddress(alertCalled.getAddress());
+        powerTransfer.setCoordinateX(alertCalled.getCoordinateX());
+        powerTransfer.setCoordinateY(alertCalled.getCoordinateY());
+        powerTransfer.setRescueGrid(alertCalled.getRescueGrid());
+        powerTransfer.setCarAddress(alertCalled.getAddress());
+        powerTransfer.setCarCoordinateX(alertCalled.getCoordinateX());
+        powerTransfer.setCarCoordinateY(alertCalled.getCoordinateY());
+
+        save(powerTransfer);
+        Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
+        // 创建力量调派单位
+        List<PowerTransferCompanyDto> powerTransferCompanyDotList = powerTransferDto.getPowerTransferCompanyDotList();
+        PowerTransferCompany powerTransferCompany;
+        // 获取任务派发模板
+
+
+        for (PowerTransferCompanyDto powerTransferCompanyDto : powerTransferCompanyDotList) {
+            powerTransferCompany = new PowerTransferCompany();
+            BeanUtils.copyProperties(powerTransferCompanyDto, powerTransferCompany);
+            powerTransferCompany.setPowerTransferId(powerTransferSequenceNbr);
+            List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList =
+                    powerTransferCompanyDto.getPowerTransferCompanyResourcesDtoList();
+            if (powerTransferCompanyResourcesDtoList.size() == 0) {
+                powerTransferCompany.setIsDistributionAgencies(true);
+                iPowerTransferCompanyService.save(powerTransferCompany);
+            } else {
+                powerTransferCompany.setIsDistributionAgencies(false);
+                iPowerTransferCompanyService.save(powerTransferCompany);
+                Long powerTransferCompanySequenceNbr = powerTransferCompany.getSequenceNbr();
+                List<PowerTransferCompanyResources> powerTransferCompanyResourcesList =
+                        DtoEntityBatchConvert(powerTransferCompanyResourcesDtoList, powerTransferCompanySequenceNbr);
+                iPowerTransferCompanyResourcesService.saveBatch(powerTransferCompanyResourcesList);
+            }
+        }
+        return true;
+    }
+
+    private List<PowerTransferCompanyResources> DtoEntityBatchConvert(List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList, Long powerTransferCompanySequenceNbr) {
+        ArrayList<PowerTransferCompanyResources> powerTransferCompanyResourcesList = new ArrayList<>();
+        PowerTransferCompanyResources powerTransferCompanyResources;
+        for (PowerTransferCompanyResourcesDto powerTransferCompanyResourcesDto : powerTransferCompanyResourcesDtoList) {
+            powerTransferCompanyResources = new PowerTransferCompanyResources();
+            BeanUtils.copyProperties(powerTransferCompanyResourcesDto, powerTransferCompanyResources);
+            powerTransferCompanyResources.setPowerTransferCompanyId(powerTransferCompanySequenceNbr);
+            powerTransferCompanyResourcesList.add(powerTransferCompanyResources);
+        }
+        return powerTransferCompanyResourcesList;
+    }
 }