添加打包插件，融合调度列表接口

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 main(String[] args) {
+    public static void main1(String[] args) {
         // 代码生成器
         AutoGenerator autoGenerator = new AutoGenerator();
 

amos-boot-jcs-system/pom.xml

@@ -19,7 +19,12 @@
 		</dependency>
   </dependencies>
 
-  <build>
-
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>

amos-boot-jcs-system/src/main/resources/application.properties

-spring.application.name=AIRPORT888
+spring.application.name=AIRPORT
+server.servlet.context-path=/jcs
 server.port=11000
 spring.profiles.active=dev
 
 spring.jackson.time-zone=GMT+8
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
\ No newline at end of file
+
+#mybatis-plus的日志开启配置，不能使用mybatis的，会找不到
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ 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/dto/AlertSubmittedDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-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;
 /**
 * 警情报送记录
 *
@@ -20,45 +11,22 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-17
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("jc_alert_submitted")
 @ApiModel(value="AlertSubmittedDto", description="警情报送记录")
-public class AlertSubmittedDto extends BaseEntity {
+public class AlertSubmittedDto {
     private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty(value = "警情id")
     private Long alertCalledId;
 
-    @ApiModelProperty(value = "业务类型")
-    private String businessType;
-
-    @ApiModelProperty(value = "业务类型code")
+    @ApiModelProperty(value = "业务类型code(警情续报、非警情确认、警情结案)")
     private String businessTypeCode;
 
-    @ApiModelProperty(value = "报送时间")
-    private Date submissionTime;
-
-    @ApiModelProperty(value = "通话记录id")
-    private String callLogId;
-
-    @ApiModelProperty(value = "发送人")
-    private String sender;
-
-    @ApiModelProperty(value = "报送方式")
-    private String submissionMethod;
-
-    @ApiModelProperty(value = "报送方式code")
+    /**
+     * 区分是警情报送还是融合调度
+     * 电话：融合调度
+     * 短信：警情报送
+     */
+    @ApiModelProperty(value = "报送方式code(电话、短信)")
     private String submissionMethodCode;
-
-    @ApiModelProperty(value = "报送内容")
-    private String submissionContent;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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.vo.AlertSubmittedExtVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * 警情报送记录 Mapper 接口
@@ -10,5 +15,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @date 2021-06-17
 */
 public interface AlertSubmittedMapper extends BaseMapper<AlertSubmitted> {
-
+    /**
+     * 根据参数获取警情报送/融合调度列表
+     *
+     * @param alertSubmittedDto
+     * @return
+     */
+    List<AlertSubmittedExtVo> listByParam(@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/service/IAlertSubmittedService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.baomidou.mybatisplus.extension.service.IService;
+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.vo.SchedulingReportingVo;
 
 /**
 * 警情报送记录 服务类
@@ -11,4 +13,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface IAlertSubmittedService extends IService<AlertSubmitted> {
 
+    /**
+     * 根据参数查询警情报送/融合调度记录
+     *
+     * @param queryParam
+     * @return SchedulingReportingVo
+     */
+    SchedulingReportingVo listByParam(AlertSubmittedDto queryParam);
 }

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

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import lombok.Data;
+
+/**
+ * @author DELL
+ */
+@Data
+public class AlertSubmittedExtVo extends AlertSubmittedVo {
+
+    /**
+     * 主键
+     */
+    private Long sequenceNbr;
+
+    /**
+     * 记录主表id
+     */
+    private Long alertSubmittedId;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 人员名称
+     */
+    private String userName;
+
+    /**
+     * 电话号码
+     */
+    private String userPhone;
+
+    /**
+     * 通话时长
+     */
+    private String communicationTime;
+
+}

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

@@ -18,5 +18,5 @@ public class SchedulingReportingVo {
     /**
      * 警情报送/融合调度列表
      */
-    List<AlertSubmittedVo> schedulingReportingList;
+    List<AlertSubmittedExtVo> schedulingReportingList;
 }

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

@@ -2,4 +2,34 @@
 <!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
+        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,
+        jaso.company_name,
+        jaso.user_name,
+        jaso.user_phone
+        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>
+    </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/AlertSubmittedController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+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.service.IAlertSubmittedService;
 import io.swagger.annotations.Api;
@@ -91,10 +92,10 @@ public class AlertSubmittedController extends BaseController {
     }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/schedulingReporting/list", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据警情id查询融合调度、警情报送列表", notes = "根据警情id查询融合调度、警情报送列表")
-    public ResponseModel listByAlertCallIdAndType() {
-        return CommonResponseUtil.success();
+    @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));
     }
 
     /**
@@ -110,6 +111,9 @@ public class AlertSubmittedController extends BaseController {
         QueryWrapper<AlertSubmitted> alertSubmittedQueryWrapper = new QueryWrapper<>();
         Class<? extends AlertSubmitted> aClass = alertSubmitted.getClass();
         Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            if (field.getName().equals("serialVersionUID")) {
+                return;
+            }
             try {
                 field.setAccessible(true);
                 Object o = field.get(alertSubmitted);
@@ -119,7 +123,7 @@ public class AlertSubmittedController extends BaseController {
                     if (type.equals(Integer.class)) {
                         Integer fileValue = (Integer) field.get(alertSubmitted);
                         alertSubmittedQueryWrapper.eq(name, fileValue);
-                    } else if (type.equals(Long.class)) {
+                    } else if (type.equals(Long.class) || "long".equals(type.toString())) {
                         Long fileValue = (Long) field.get(alertSubmitted);
                         alertSubmittedQueryWrapper.eq(name, fileValue);
                     } else if (type.equals(String.class)) {

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;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * 警情报送记录 服务实现类
 *
@@ -15,4 +21,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class AlertSubmittedServiceImpl extends ServiceImpl<AlertSubmittedMapper, AlertSubmitted> implements IAlertSubmittedService {
 
+    @Override
+    public SchedulingReportingVo listByParam(AlertSubmittedDto queryParam) {
+        SchedulingReportingVo schedulingReportingVo = new SchedulingReportingVo();
+        List<AlertSubmittedExtVo> alertSubmittedExtVoList = this.baseMapper.listByParam(queryParam);
+        schedulingReportingVo.setSchedulingReportingList(alertSubmittedExtVoList);
+        String extraInfo = "已调度电话" + alertSubmittedExtVoList.size() + "起";
+        schedulingReportingVo.setExtraInfo(extraInfo);
+        return schedulingReportingVo;
+    }
 }