bug修改

beidou-admin/src/main/java/cn/com/taiji/beidou/web/controller/ship/ShipArchivesController.java

@@ -3,6 +3,7 @@ package cn.com.taiji.beidou.web.controller.ship;
 import cn.com.taiji.beidou.common.core.controller.BaseController;
 import cn.com.taiji.beidou.common.core.domain.R;
 import cn.com.taiji.beidou.common.core.page.TableDataInfo;
+import cn.com.taiji.beidou.common.core.redis.RedisCache;
 import cn.com.taiji.beidou.common.utils.MathUtils;
 import cn.com.taiji.beidou.ship.archives.domain.*;
 import cn.com.taiji.beidou.ship.archives.service.ShipArchivesService;
@@ -10,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -26,6 +28,8 @@ public class ShipArchivesController extends BaseController {
     @Resource
     private ShipArchivesService shipArchivesService;
 
+    @Resource
+    private RedisCache redisCache;
 
     @ApiOperation("获取船舶档案列表")
     @PostMapping("/shipList")
@@ -70,16 +74,17 @@ public class ShipArchivesController extends BaseController {
 
     @ApiOperation("船舶档案统计")
     @GetMapping("/getShipTotal")
-    public R<ShipArchivesTotal> getShipTotal(String shipId,String deptId){
+    public R<ShipArchivesTotal> getShipTotal(String deptId){
         try {
-            ShipArchivesTotal total = shipArchivesService.getShipTotal(shipId,deptId);
-            Double shipTotal = Double.parseDouble(total.getShipTotal());
-
-            total.setOnlineTotalRate(MathUtils.getHalfUp(Double.parseDouble(total.getOnlineTotal())/shipTotal*100,2));
-            total.setOfflineTotalRate(MathUtils.getHalfUp(Double.parseDouble(total.getOfflineTotal())/shipTotal*100,2));
-            total.setInPortRate(MathUtils.getHalfUp(Double.parseDouble(total.getInPort())/shipTotal*100,2));
-            total.setOffPortRate(MathUtils.getHalfUp(Double.parseDouble(total.getOffPort())/shipTotal*100,2));
-            total.setMarkRate(MathUtils.getHalfUp(Double.parseDouble(total.getMark())/shipTotal*100,2));
+            ShipArchivesTotal total = null;
+            if (StringUtils.isBlank(deptId) || "4635".equals(deptId)){
+                 total = redisCache.getCacheObject("SHIP_TOTAL_4635");
+                 if(total == null){
+                     total = shipArchivesService.getShipTotal(deptId);
+                 }
+            }else {
+                 total = shipArchivesService.getShipTotal(deptId);
+            }
             return R.ok(total);
         }catch (Exception e){
             return R.fail(e.getMessage());

beidou-admin/src/main/java/cn/com/taiji/beidou/web/controller/ship/ShipWarningRuleController.java

@@ -102,9 +102,9 @@ public class ShipWarningRuleController extends BaseController {
 
     @ApiOperation("预警模型列表")
     @GetMapping("/getWarningModelList")
-    public TableDataInfo getWarningModelList(Integer pageNum, Integer pageSize){
+    public TableDataInfo getWarningModelList(String modelName, Integer pageNum, Integer pageSize){
         startPage(pageNum,pageSize);
-        List<WarningModelResult> results = shipWarningModelMapper.selectModelList(null);
+        List<WarningModelResult> results = shipWarningModelMapper.selectModelList(modelName,null);
         TableDataInfo dataTable = getDataTable(results);
         return dataTable;
     }
@@ -112,7 +112,7 @@ public class ShipWarningRuleController extends BaseController {
     @ApiOperation(value = "预警模型详情",notes = "参数是预警模型ID，返回该模型关联的预警参数和预警区域")
     @GetMapping("/WarningModelById")
     public R<WarningModelResult> WarningModelById(String id){
-        List<WarningModelResult> results = shipWarningModelMapper.selectModelList(id);
+        List<WarningModelResult> results = shipWarningModelMapper.selectModelList(null,id);
         if(results==null||results.size()<1){
             return R.fail();
         }

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/archives/mapper/ShipArchivesMapper.java

@@ -56,11 +56,10 @@ public interface ShipArchivesMapper{
 
     /**
      * 统计
-     * @param shipId
      * @param deptId
      * @return
      */
-    ShipArchivesTotal getShipTotal(@Param("shipId")String shipId,@Param("deptId")String deptId);
+    ShipArchivesTotal getShipTotal(@Param("deptId")String deptId);
 
 
 }

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/archives/service/ShipArchivesService.java

@@ -28,12 +28,11 @@ public interface ShipArchivesService{
     ShipDisposeResult selectDisposeById(String devideNo, String warningId);
 
     /**
-     *
-     * @param shipId
+     *船舶档案统计
      * @param deptId
      * @return
      */
-    ShipArchivesTotal getShipTotal(String shipId,String deptId);
+    ShipArchivesTotal getShipTotal(String deptId);
 
 
 }

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/archives/service/impl/ShipArchivesServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.beidou.ship.archives.service.impl;
 
 import cn.com.taiji.beidou.common.constant.Constants;
+import cn.com.taiji.beidou.common.utils.MathUtils;
 import cn.com.taiji.beidou.common.utils.SecurityUtils;
 import cn.com.taiji.beidou.common.utils.uuid.SnowFlakeIdWorker;
 import cn.com.taiji.beidou.ship.archives.domain.*;
@@ -56,8 +57,18 @@ public class ShipArchivesServiceImpl implements ShipArchivesService {
     }
 
     @Override
-    public ShipArchivesTotal getShipTotal(String shipId,String deptId){
-        return shipArchivesMapper.getShipTotal(shipId,deptId);
+    public ShipArchivesTotal getShipTotal(String deptId){
+
+        ShipArchivesTotal total = shipArchivesMapper.getShipTotal(deptId);
+
+        Double shipTotal = Double.parseDouble(total.getShipTotal());
+        total.setOnlineTotalRate(MathUtils.getHalfUp(Double.parseDouble(total.getOnlineTotal())/shipTotal*100,2));
+        total.setOfflineTotalRate(MathUtils.getHalfUp(Double.parseDouble(total.getOfflineTotal())/shipTotal*100,2));
+        total.setInPortRate(MathUtils.getHalfUp(Double.parseDouble(total.getInPort())/shipTotal*100,2));
+        total.setOffPortRate(MathUtils.getHalfUp(Double.parseDouble(total.getOffPort())/shipTotal*100,2));
+        total.setMarkRate(MathUtils.getHalfUp(Double.parseDouble(total.getMark())/shipTotal*100,2));
+
+        return total;
     }
 
 }

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/focus/domain/FocusShipResult.java

@@ -15,7 +15,7 @@ import java.util.Date;
 public class FocusShipResult {
 
     @ApiModelProperty("关注ID")
-    private Long focusId;
+    private String focusId;
     @ApiModelProperty("关注人ID")
     private String userId;
 
@@ -115,4 +115,7 @@ public class FocusShipResult {
 
     @ApiModelProperty("终端状态")
     private Integer deviceStatus;
+
+    private String kwh;
+    private String location;
 }

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/warning/model/mapper/ShipWarningModelMapper.java

@@ -15,7 +15,13 @@ import java.util.List;
 public interface ShipWarningModelMapper {
 
 
-    List<WarningModelResult> selectModelList(String id);
+    /**
+     * 模型列表
+     * @param modelName
+     * @param id
+     * @return
+     */
+    List<WarningModelResult> selectModelList(@Param("modelName")String modelName,@Param("id")String id);
 
     List<WarningRuleResult> selectRuleList(@Param("enabled") String enabled,@Param("id")String id);
 

beidou-ship/src/main/resources/mapper/FocusShipMapper.xml

@@ -25,8 +25,10 @@
         <result property="createTime"    column="create_time"    />
         <result property="modifyTime"      column="modify_time"      />
         <result property="ownerType"    column="owner_type"    />
-        <result property="lastStatus"    column="last_status"    />
+        <result property="lastStatus"    column="STATUS"    />
         <result property="deviceStatus"    column="device_status"    />
+        <result property="location"    column="location"    />
+        <result property="kwh" column="kwh"/>
     </resultMap>
 
     <insert id="insertFocusShip" parameterType="focusShipData">
@@ -52,21 +54,27 @@
     </delete>
 
     <select id="selectById" parameterType="long" resultMap="focusShipDetail">
-        select focus.user_id,focus.focus_id,focus.focus_type,focus.create_time as focus_create,st.mark as device_status,
-                dept.pscmc as dept_name,archives.*
+        select focus.user_id,focus.focus_id as focus_id,focus.focus_type,focus.create_time as focus_create,
+            (CASE st.is_online WHEN 'ONLINE' THEN 1 WHEN 'OFFLINE' THEN 2 WHEN 'MARK' THEN 3 ELSE 1 END ) AS STATUS,
+            dept.pscmc as dept_name,location.kwh,location.location,archives.*
             from ax_beidou_ship_archives archives
             INNER JOIN ax_beidou_focus_ship focus on archives.devide_no = focus.devide_no
             INNER JOIN ax_beidou_dept dept on archives.police_station_id = dept.pscbh
-            INNER JOIN ax_beidou_ship_status st on st.devide_no = focus.devide_no
+            INNER JOIN ax_beidou_ship_status st on st.device_id = focus.devide_no
+            LEFT JOIN ax_beidou_ship_location location on focus.devide_no = location.device_id
             where focus.focus_id = #{focusId}
     </select>
 
     <select id="selectList" parameterType="focusShipReq"  resultMap="focusShipDetail">
-        select focus.user_id,focus.focus_id,focus.focus_type,focus.create_time as focus_create,dept.pscmc as dept_name,archives.*
+        select focus.user_id,focus.focus_id,focus.focus_type,focus.create_time as focus_create,dept.pscmc as dept_name,
+        (CASE st.is_online WHEN 'ONLINE' THEN 1 WHEN 'OFFLINE' THEN 2 WHEN 'MARK' THEN 3 ELSE 1 END ) AS STATUS,
+        location.kwh,location.location,archives.*
         from ax_beidou_ship_archives archives
-        INNER JOIN ax_beidou_focus_ship focus
-        INNER JOIN ax_beidou_dept dept
-        where archives.devide_no = focus.devide_no and archives.police_station_id = dept.pscbh
+        INNER JOIN ax_beidou_focus_ship focus on archives.devide_no = focus.devide_no
+        INNER JOIN ax_beidou_dept dept on archives.police_station_id = dept.pscbh
+        LEFT JOIN ax_beidou_ship_status st on st.device_id = focus.devide_no
+        LEFT JOIN ax_beidou_ship_location location on focus.devide_no = location.device_id
+        where 1=1
         <if test="shipId != null and shipId != ''">and (archives.ship_id like concat('%', #{shipId},'%') or archives.devide_no like concat('%', #{devideNo},'%'))</if>
         <if test="deptId != null and deptId != ''">and dept.xw_dept_id like concat('%',#{deptId},'%')</if>
         <if test="userId != null and userId != ''">and focus.user_id=#{userId}</if>

beidou-ship/src/main/resources/mapper/ShipStatusMapper.xml

@@ -34,6 +34,7 @@
         <result property="numberDay"    column="number_day"    />
         <result property="deviceStatus"    column="device_status"    />
         <result property="status" column="status"/>
+        <result property="lastStatus" column="status"/>
     </resultMap>
 
     <select id="selectById" parameterType="string" resultMap="shipStatusResult">

beidou-ship/src/main/resources/mapper/ShipWarningModelMapper.xml

@@ -99,6 +99,7 @@
 		from ax_beidou_warning_model model
         where model.del_flag='0'
         <if test="id != null and id != ''">and model.id = #{id}</if>
+        <if test="modelName != null and modelName != ''">and model.name like concat('%',#{modelName},'%')</if>
         ORDER BY model.create_time DESC
     </select>
 
@@ -429,14 +430,14 @@
     </delete>
 
     <select id="selectWarningModelByName" parameterType="string" resultType="integer">
-        select count(*) from ax_beidou_warning_model where `name` = #{modelName}
+        select count(*) from ax_beidou_warning_model where del_flag = '0' and `name` = #{modelName}
         <if test="id != null and id != ''">
             and id != #{id}
         </if>
     </select>
 
     <select id="selectWarningRuleByName" parameterType="string" resultType="integer">
-        select count(*) from ax_beidou_warning_rule where `name` = #{ruleName}
+        select count(*) from ax_beidou_warning_rule where del_flag = '0' and `name` = #{ruleName}
         <if test="id != null and id != ''">
             and id != #{id}
         </if>

beidou-ship/src/main/resources/mapper/WarningRecordMapper.xml

@@ -44,7 +44,8 @@
                 and dept.xw_dept_id like concat('%',#{deptId},'%')
             </if>
             <if test="shipId != null and shipId != ''">
-                and archives.ship_id like concat('%',#{shipId},'%')
+                and (archives.ship_id like concat('%',#{shipId},'%')
+                or archives.devide_no like concat('%',#{shipId},'%'))
             </if>
             <if test="startTime != null and startTime != ''">and record.warning_time &gt; #{startTime}</if>
             <if test="endTime != null and endTime != ''">and record.warning_time &lt; #{endTime}</if>