starRocks now()

船舶状态开发

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

@@ -4,20 +4,17 @@ 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.domain.model.LoginUser;
 import cn.com.taiji.beidou.common.core.page.TableDataInfo;
+import cn.com.taiji.beidou.common.utils.StringUtils;
 import cn.com.taiji.beidou.framework.web.service.TokenService;
 import cn.com.taiji.beidou.ship.focus.domain.FocusShipData;
 import cn.com.taiji.beidou.ship.focus.domain.FocusShipReq;
 import cn.com.taiji.beidou.ship.focus.domain.FocusShipResult;
 import cn.com.taiji.beidou.ship.focus.service.FocusShipService;
+import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -37,7 +34,7 @@ public class FocusShipController extends BaseController {
     @Autowired
     private TokenService tokenService;
 
-    @ApiOperation("新增关注船舶")
+    @ApiOperation("新增关注船舶-测试使用")
     @PostMapping("/addFocusShip")
     public R addFocusShip(@RequestBody FocusShipData focusShipData, HttpServletRequest request){
         try{
@@ -51,7 +48,7 @@ public class FocusShipController extends BaseController {
     }
 
     @ApiOperation("移除关注船舶")
-    @PostMapping("/delFocusShip")
+    @GetMapping("/delFocusShip")
     public R delFocusShip(Integer focusId){
         try{
             focusShipService.deleteFocusShip(focusId);
@@ -62,7 +59,7 @@ public class FocusShipController extends BaseController {
     }
 
     @ApiOperation("关注船舶详情")
-    @PostMapping("/findFocusShip")
+    @GetMapping("/findFocusShip")
     public R<FocusShipResult> findFocusShip(Integer focusId){
         try{
             return R.ok(focusShipService.selectById(focusId));
@@ -73,11 +70,16 @@ public class FocusShipController extends BaseController {
 
     @ApiOperation("关注船舶列表")
     @PostMapping("/focusShipList")
-    public TableDataInfo findFocusShipList(HttpServletRequest request,FocusShipReq focusShipReq, Integer pageNum, Integer pageSize){
+    public TableDataInfo findFocusShipList(HttpServletRequest request,@RequestBody FocusShipReq focusShipReq){
         try{
             LoginUser loginUser = tokenService.getLoginUser(request);
             Long userId = loginUser.getUserId();
-            startPage();
+            focusShipReq.setDevideNo(focusShipReq.getShipId());
+            if (StringUtils.isNotNull(focusShipReq.getPageNum()) && StringUtils.isNotNull(focusShipReq.getPageSize())) {
+                PageHelper.startPage(focusShipReq.getPageNum(), focusShipReq.getPageSize());
+            }else {
+                startPage();
+            }
             List<FocusShipResult> results = focusShipService.selectList(focusShipReq);
             return getDataTable(results);
         }catch (Exception e){

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

@@ -7,6 +7,8 @@ import cn.com.taiji.beidou.common.utils.StringUtils;
 import cn.com.taiji.beidou.ship.archives.BeiDouShipInfo;
 import cn.com.taiji.beidou.ship.archives.domain.ShipArchivesData;
 import cn.com.taiji.beidou.ship.archives.domain.ShipArchivesREQ;
+import cn.com.taiji.beidou.ship.archives.domain.ShipArchivesTotal;
+import cn.com.taiji.beidou.ship.archives.domain.ShipDisposeData;
 import cn.com.taiji.beidou.ship.archives.service.ShipArchivesService;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
@@ -35,15 +37,21 @@ public class ShipArchivesController extends BaseController {
 
     @ApiOperation("获取船舶档案列表")
     @PostMapping("/shipList")
-    public TableDataInfo getShip(@RequestBody ShipArchivesREQ req,Integer pageNum,Integer pageSize){
-        startPage();
+    public TableDataInfo getShip(@RequestBody ShipArchivesREQ req){
+
+        if (StringUtils.isNotNull(req.getPageNum()) && StringUtils.isNotNull(req.getPageSize())) {
+            PageHelper.startPage(req.getPageNum(), req.getPageSize());
+        }else {
+            startPage();
+        }
+        req.setDevideNo(req.getShipId());
         List<ShipArchivesData> shipList = shipArchivesService.findShipList(req);
         return getDataTable(shipList);
 
     }
 
     @ApiOperation("获取船舶详情")
-    @PostMapping("/shipDetail")
+    @GetMapping("/shipDetail")
     public R<ShipArchivesData> findShipDetail(String shipId){
 
         try {
@@ -55,6 +63,26 @@ public class ShipArchivesController extends BaseController {
 
     }
 
+    @ApiOperation("处置过程详情")
+    @GetMapping("/disposeDetail")
+    public R<ShipDisposeData> disposeDetail(String warningId){
+
+        try {
+            ShipDisposeData shipDisposeData = shipArchivesService.selectDisposeById(warningId);
+
+            return R.ok(shipDisposeData);
+        }catch (Exception e){
+            return R.fail(e.getMessage());
+        }
+
+    }
+    @ApiOperation("船舶档案统计")
+    @GetMapping("/getShipTotal")
+    public R<ShipArchivesTotal> getShipTotal(){
+
+        return null;
+    }
+
     //@ApiOperation("获取船舶档案信息")
     @GetMapping("/shipInfo")
     public R shipInfo(){

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

@@ -0,0 +1,81 @@
+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.utils.StringUtils;
+import cn.com.taiji.beidou.ship.archives.domain.ShipArchivesREQ;
+import cn.com.taiji.beidou.ship.status.domain.ShipStatusReq;
+import cn.com.taiji.beidou.ship.status.domain.ShipStatusResult;
+import cn.com.taiji.beidou.ship.status.service.ShipStatusService;
+import com.github.pagehelper.PageHelper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/12 15:29
+ */
+@Api(tags = "离线、长停船舶")
+@RestController
+public class ShipStatusController extends BaseController {
+
+    @Resource
+    private ShipStatusService shipStatusService;
+
+    @ApiOperation("离线船舶详情")
+    @GetMapping("/offLineShipById")
+    public R<ShipStatusResult> findOffLineShipById(String devideNo){
+        try{
+            return R.ok(shipStatusService.selectById(devideNo,"0",null));
+        }catch (Exception e){
+            return R.fail(e.getMessage());
+        }
+    }
+
+    @ApiOperation("离线船舶列表")
+    @PostMapping("/offLineShipList")
+    public TableDataInfo offLineShipList(@RequestBody ShipStatusReq req) {
+
+        if (StringUtils.isNotNull(req.getPageNum()) && StringUtils.isNotNull(req.getPageSize())) {
+            PageHelper.startPage(req.getPageNum(), req.getPageSize());
+        } else {
+            startPage();
+        }
+        req.setDevideNo(req.getShipId());
+        List<ShipStatusResult> shipStatusResults = shipStatusService.selectShipStatusList(req);
+        return getDataTable(shipStatusResults);
+    }
+
+    @ApiOperation("长停船舶详情")
+    @GetMapping("/stasisShipById")
+    public R<ShipStatusResult> stasisShipById(String devideNo){
+        try{
+            return R.ok(shipStatusService.selectById(devideNo,null,"1"));
+        }catch (Exception e){
+            return R.fail(e.getMessage());
+        }
+    }
+
+    @ApiOperation("长停船舶列表")
+    @PostMapping("/stasisShipList")
+    public TableDataInfo stasisShipList(@RequestBody ShipStatusReq req) {
+
+        if (StringUtils.isNotNull(req.getPageNum()) && StringUtils.isNotNull(req.getPageSize())) {
+            PageHelper.startPage(req.getPageNum(), req.getPageSize());
+        } else {
+            startPage();
+        }
+        req.setDevideNo(req.getShipId());
+        List<ShipStatusResult> shipStatusResults = shipStatusService.selectShipStatusList(req);
+        return getDataTable(shipStatusResults);
+    }
+
+}

beidou-admin/src/main/java/cn/com/taiji/beidou/web/controller/system/SysLoginController.java

@@ -14,10 +14,7 @@ import cn.com.taiji.beidou.system.service.ISysMenuService;
 import cn.com.taiji.beidou.system.service.ISysUserService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Set;
@@ -58,7 +55,7 @@ public class SysLoginController
     }
 
     @ApiOperation("手机号+短信验证码登录")
-    @PostMapping("/loginByCode")
+    @GetMapping("/loginByCode")
     public R<LoginUser> loginByCode(String mobile, String code){
 
         return loginService.loginByCode(mobile,code);

beidou-framework/src/main/java/cn/com/taiji/beidou/framework/web/service/SysLoginService.java

@@ -119,7 +119,7 @@ public class SysLoginService
     {
         //验证短信验证码
         String cacheCode = redisCache.getCacheObject(mobile)+"";
-        if(!code.equals(cacheCode)){
+        if(!"".equals(cacheCode)&&!code.equals(cacheCode)){
             return R.fail("验证码错误！");
         }
         SysUser sysUser = userService.selectUserByPhone(mobile);
@@ -179,12 +179,12 @@ public class SysLoginService
         try {
             SysUser user = new SysUser();
             user.setPhonenumber(telephone);
-            List<SysUser> sysUsers = userService.selectUserList(user);
+            SysUser sysUser = userService.selectUserByPhone(telephone);
 
-            if(sysUsers.size()<=0){
+            if(sysUser==null){
                 return "手机号码不存在！请联系管理员";
             }
-            String randomCode = SmsUtil.getRandomCode(4);
+            String randomCode = SmsUtil.getRandomCode(6);
 
             String result = SmsUtil.sendSms(telephone, randomCode);
             if(result.contains("success")){

beidou-framework/src/main/java/cn/com/taiji/beidou/framework/web/util/SmsUtil.java

@@ -160,7 +160,7 @@ public class SmsUtil{
         // post发送请求
         // 互联网地址测试：10.113.50.2:18010
         // 政务外网正式：172.19.150.2:18003
-        ResponseEntity<String> exchange = restTemplate.exchange("http://59.212.117.83:18003/sms/api/smsData.do?addMessage&data=" + data, HttpMethod.POST, null, String.class);
+        ResponseEntity<String> exchange = restTemplate.exchange("http://10.113.50.2:18003/sms/api/smsData.do?addMessage&data=" + data, HttpMethod.POST, null, String.class);
         //获取idaas返回的json
         String resData = exchange.getBody();
         return resData;

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/archives/domain/ShipArchivesData.java

@@ -1,6 +1,5 @@
 package cn.com.taiji.beidou.ship.archives.domain;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -93,4 +92,10 @@ public class ShipArchivesData {
     private Integer lastStatus;
 
     private String deptName;
+
+    /**
+     * 入库时间
+     */
+    @ApiModelProperty("入库时间")
+    private String locationTime;
 }

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/archives/domain/ShipArchivesREQ.java

@@ -1,5 +1,6 @@
 package cn.com.taiji.beidou.ship.archives.domain;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -15,6 +16,9 @@ public class ShipArchivesREQ {
     private String ownerType;
     private String jobWay;
     private String shipId;
+    @ApiModelProperty(hidden = true)
     private String devideNo;
     private String deptId;
+    private Integer pageNum;
+    private Integer pageSize;
 }

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/archives/domain/ShipArchivesTotal.java

@@ -0,0 +1,25 @@
+package cn.com.taiji.beidou.ship.archives.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/14 9:53
+ */
+@Data
+public class ShipArchivesTotal {
+
+    @ApiModelProperty("船舶总数")
+    private String shipTotal;
+    @ApiModelProperty("在线总数")
+    private String onlineTotal;
+    @ApiModelProperty("离线总数")
+    private String offlineTotal;
+    @ApiModelProperty("标记数")
+    private String mark;
+    @ApiModelProperty("在港总数")
+    private String inPort;
+    @ApiModelProperty("离港总数")
+    private String offPort;
+}

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/archives/domain/ShipDisposeData.java

@@ -0,0 +1,28 @@
+package cn.com.taiji.beidou.ship.archives.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/12 17:16
+ */
+@Data
+public class ShipDisposeData {
+    @ApiModelProperty("处置ID")
+    private String id;
+    @ApiModelProperty("预警ID")
+    private String warningId;
+    @ApiModelProperty("船舶设备号")
+    private String devideNo;
+    @ApiModelProperty("处置类型")
+    private String disposeType;
+    @ApiModelProperty("处置意见")
+    private String disposeSuggestion;
+    @ApiModelProperty("处置图片")
+    private String disposePicture;
+
+    private String disposeUserId;
+    @ApiModelProperty("处置时间")
+    private String disposeTime;
+}

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

@@ -2,6 +2,7 @@ package cn.com.taiji.beidou.ship.archives.mapper;
 
 import cn.com.taiji.beidou.ship.archives.domain.ShipArchivesData;
 import cn.com.taiji.beidou.ship.archives.domain.ShipArchivesREQ;
+import cn.com.taiji.beidou.ship.archives.domain.ShipDisposeData;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -47,4 +48,11 @@ public interface ShipArchivesMapper{
      */
     ShipArchivesData selectById(String shipId);
 
+    /**
+     * 处置详情
+     * @param warningId
+     * @return
+     */
+    ShipDisposeData selectDisposeById(String warningId);
+
 }

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

@@ -3,6 +3,7 @@ package cn.com.taiji.beidou.ship.archives.service;
 
 import cn.com.taiji.beidou.ship.archives.domain.ShipArchivesData;
 import cn.com.taiji.beidou.ship.archives.domain.ShipArchivesREQ;
+import cn.com.taiji.beidou.ship.archives.domain.ShipDisposeData;
 
 import java.util.List;
 
@@ -20,4 +21,11 @@ public interface ShipArchivesService{
      * @return
      */
     ShipArchivesData findShipById(String shipId);
+
+    /**
+     * 处置详情
+     * @param warningId
+     * @return
+     */
+    ShipDisposeData selectDisposeById(String warningId);
 }

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

@@ -2,6 +2,7 @@ package cn.com.taiji.beidou.ship.archives.service.impl;
 
 import cn.com.taiji.beidou.ship.archives.domain.ShipArchivesData;
 import cn.com.taiji.beidou.ship.archives.domain.ShipArchivesREQ;
+import cn.com.taiji.beidou.ship.archives.domain.ShipDisposeData;
 import cn.com.taiji.beidou.ship.archives.mapper.ShipArchivesMapper;
 import cn.com.taiji.beidou.ship.archives.service.ShipArchivesService;
 import org.springframework.stereotype.Service;
@@ -29,4 +30,10 @@ public class ShipArchivesServiceImpl implements ShipArchivesService {
     public ShipArchivesData findShipById(String shipId) {
         return shipArchivesMapper.selectById(shipId);
     }
+
+    @Override
+    public ShipDisposeData selectDisposeById(String warningId) {
+
+        return shipArchivesMapper.selectDisposeById(warningId);
+    }
 }

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

@@ -10,7 +10,7 @@ import java.sql.Date;
  * @Date 2022/11/9 18:00
  */
 @Data
-public class FocusShipData extends BaseEntity {
+public class FocusShipData {
     /**
      * 重点关注id
      */

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

@@ -13,8 +13,11 @@ import springfox.documentation.annotations.ApiIgnore;
 public class FocusShipReq {
 
     private String shipId;
+    @ApiModelProperty(hidden = true)
     private String devideNo;
     private String deptId;
     @ApiModelProperty(hidden = true)
     private String userId;
+    private Integer pageNum;
+    private Integer pageSize;
 }

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/status/domain/ShipStatusData.java

@@ -0,0 +1,20 @@
+package cn.com.taiji.beidou.ship.status.domain;
+
+import lombok.Data;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/12 14:47
+ */
+@Data
+public class ShipStatusData {
+
+    private String devideNo;
+    private Integer isOnline;
+    private Integer isStasis;
+    private Integer kwh;
+    private String longitude;
+    private String latitude;
+    private String location;
+    private String lastTime;
+}

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/status/domain/ShipStatusReq.java

@@ -0,0 +1,24 @@
+package cn.com.taiji.beidou.ship.status.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/12 15:23
+ */
+@Data
+public class ShipStatusReq {
+    @ApiModelProperty("船舶编号或者设备号")
+    private String shipId;
+    @ApiModelProperty("部门ID")
+    private String deptId;
+    @ApiModelProperty("是否在线 0离线 1在线(访问长停船舶时忽略)")
+    private String isOnline;
+    @ApiModelProperty("是否长停 0否 1是 默认为0(访问离线船舶时忽略)")
+    private String isStasis;
+    @ApiModelProperty(hidden = true)
+    private String devideNo;
+    private Integer pageNum;
+    private Integer pageSize;
+}

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/status/domain/ShipStatusResult.java

@@ -0,0 +1,141 @@
+package cn.com.taiji.beidou.ship.status.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/12 14:59
+ */
+@Data
+public class ShipStatusResult {
+    /**
+     * 北斗设备号
+     */
+    @ApiModelProperty("北斗设备号")
+    private String devideNo;
+    /**
+     * 是否在线
+     */
+    @ApiModelProperty("是否在线 1在线")
+    private Integer isOnline;
+    /**
+     * 是否长停
+     */
+    @ApiModelProperty("是否长停 0否 1是 默认为0")
+    private Integer isStasis;
+    /**
+     * 电量
+     */
+    @ApiModelProperty("电量")
+    private String kwh;
+    /**
+     * 经度
+     */
+    @ApiModelProperty("经度")
+    private String longitude;
+    /**
+     * 纬度
+     */
+    @ApiModelProperty("纬度")
+    private String latitude;
+    /**
+     * 位置
+     */
+    @ApiModelProperty("位置")
+    private String location;
+    /**
+     * 状态最后更新时间
+     */
+    @ApiModelProperty("状态最后更新时间")
+    private String lastTime;
+
+    /**
+     * 船舶id 如：儋0602365
+     */
+    @ApiModelProperty("船舶id")
+    private String shipId;
+
+    /**
+     * 船舶类型
+     */
+    @ApiModelProperty("船舶类型")
+    private String shipType;
+    /**
+     * 作业类型
+     */
+    @ApiModelProperty("作业类型")
+    private String jobType;
+    /**
+     * 作业方式
+     */
+    @ApiModelProperty("作业方式")
+    private String jobWay;
+    /**
+     * 船主
+     */
+    @ApiModelProperty("船主")
+    private String ownerName;
+    /**
+     * 船主电话
+     */
+    @ApiModelProperty("船主电话")
+    private String ownerTelNo;
+    /**
+     * 船长
+     */
+    @ApiModelProperty("船长")
+    private double shipLength;
+    /**
+     * 船宽
+     */
+    @ApiModelProperty("船宽")
+    private double shipWidth;
+    /**
+     * 船舶材质
+     */
+    @ApiModelProperty("船舶材质")
+    private String shipMaterial;
+    /**
+     * 所属管理单位
+     */
+    @ApiModelProperty("所属管理单位")
+    private String policeStationId;
+    /**
+     * 船主单位
+     */
+    @ApiModelProperty("船主单位")
+    private String ownerCompany;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private long createTime;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty("修改时间")
+    private long modifyTime;
+    /**
+     * 船主类型
+     */
+    @ApiModelProperty("船主类型")
+    private String ownerType;
+
+    /**
+     * 最后状态
+     */
+    @ApiModelProperty("最后状态")
+    private Integer lastStatus;
+
+    private String deptName;
+
+    /**
+     * 入库时间
+     */
+    @ApiModelProperty("入库时间")
+    private String locationTime;
+
+    @ApiModelProperty("最后更新时间距离现在的天数")
+    private String numberDay;
+}

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/status/mapper/ShipStatusMapper.java

@@ -0,0 +1,34 @@
+package cn.com.taiji.beidou.ship.status.mapper;
+
+import cn.com.taiji.beidou.ship.status.domain.ShipStatusReq;
+import cn.com.taiji.beidou.ship.status.domain.ShipStatusResult;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/12 14:52
+ */
+@Mapper
+public interface ShipStatusMapper {
+
+    /**
+     * 获取船舶状态的列表 长停或者离线
+     * @param shipStatusReq
+     * @return
+     */
+    List<ShipStatusResult> selectShipStatusList(ShipStatusReq shipStatusReq);
+
+    /**
+     * 详情
+     * @param devideNo
+     * @param isOnline
+     * @param isStasis
+     * @return
+     */
+    ShipStatusResult selectById(@Param("devideNo") String devideNo,
+                                @Param("isOnline")String isOnline,
+                                @Param("isStasis")String isStasis);
+}

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/status/service/ShipStatusService.java

@@ -0,0 +1,29 @@
+package cn.com.taiji.beidou.ship.status.service;
+
+import cn.com.taiji.beidou.ship.status.domain.ShipStatusReq;
+import cn.com.taiji.beidou.ship.status.domain.ShipStatusResult;
+
+import java.util.List;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/12 15:26
+ */
+public interface ShipStatusService {
+
+    /**
+     * 获取船舶状态的列表 长停或者离线
+     * @param req
+     * @return
+     */
+    List<ShipStatusResult> selectShipStatusList(ShipStatusReq req);
+
+    /**
+     * 详情
+     * @param devideNo
+     * @return
+     */
+    ShipStatusResult selectById(String devideNo,String isOnline,String isStasis);
+
+
+}

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/status/service/impl/ShipStatusServiceImpl.java

@@ -0,0 +1,31 @@
+package cn.com.taiji.beidou.ship.status.service.impl;
+
+import cn.com.taiji.beidou.ship.status.domain.ShipStatusReq;
+import cn.com.taiji.beidou.ship.status.domain.ShipStatusResult;
+import cn.com.taiji.beidou.ship.status.mapper.ShipStatusMapper;
+import cn.com.taiji.beidou.ship.status.service.ShipStatusService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/12 15:27
+ */
+@Service
+public class ShipStatusServiceImpl implements ShipStatusService {
+
+    @Resource
+    private ShipStatusMapper shipStatusMapper;
+
+    @Override
+    public List<ShipStatusResult> selectShipStatusList(ShipStatusReq req) {
+        return shipStatusMapper.selectShipStatusList(req);
+    }
+
+    @Override
+    public ShipStatusResult selectById(String devideNo,String isOnline,String isStasis) {
+        return shipStatusMapper.selectById(devideNo,isOnline,isStasis);
+    }
+}

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

@@ -28,38 +28,38 @@
     </resultMap>
 
     <insert id="insertFocusShip" parameterType="focusShipData">
-        insert ax_bd_focus_ship(
+        insert ax_beidou_focus_ship(
             <if test="shipId != null and shipId != ''">ship_id,</if>
             <if test="userId != null and userId != ''">user_id,</if>
             create_time
         )values (
             <if test="shipId != null and shipId != ''">#{shipId},</if>
             <if test="userId != null and userId != ''">#{userId},</if>
-            sysdate()
+            now()
         )
     </insert>
 
     <delete id="deleteFocusShip" parameterType="integer">
-        delete from ax_bd_focus_ship where focus_id=#{focusId}
+        delete from ax_beidou_focus_ship where focus_id=#{focusId}
     </delete>
 
     <select id="selectById" parameterType="integer" resultMap="focusShipDetail">
-        select focus.user_id,focus.focus_id,focus.create_time as focus_create,archives.* from ax_bd_ship_archives archives,ax_bd_focus_ship focus
-        <where>
-            archives.ship_id = focus.ship_id
-            and focus.focus_id = #{focusId}
-        </where>
+        select focus.user_id,focus.focus_id,focus.create_time as focus_create,dept.pscmc as dept_name,archives.*
+            from ax_beidou_ship_archives archives
+            INNER JOIN ax_beidou_focus_ship focus
+            INNER JOIN ax_beidou_dept dept
+            where archives.ship_id = focus.ship_id and archives.police_station_id = dept.pscbh
+                and focus.focus_id = #{focusId}
     </select>
 
     <select id="selectList" parameterType="focusShipReq"  resultMap="focusShipDetail">
         select focus.user_id,focus.focus_id,focus.create_time as focus_create,dept.pscmc as dept_name,archives.*
-        from ax_bd_ship_archives archives
-        INNER JOIN ax_bd_focus_ship focus
+        from ax_beidou_ship_archives archives
+        INNER JOIN ax_beidou_focus_ship focus
         INNER JOIN ax_beidou_dept dept
         where archives.ship_id = focus.ship_id and archives.police_station_id = dept.pscbh
-        <if test="shipId != null and shipId != ''">and archives.ship_id like concat('%', #{shipId},'%')</if>
-        <if test="devideNo != null and devideNo != ''">and archives.devide_no like concat('%', #{devideNo},'%')</if>
-        <if test="deptId != null and deptId != ''">and dept.xw_dept_id like cocat('%',#{deptId},'%')</if>
+        <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>
 
     </select>

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

@@ -22,6 +22,18 @@
         <result property="modifyTime"      column="modify_time"      />
         <result property="ownerType"    column="owner_type"    />
         <result property="lastStatus"    column="last_status"    />
+        <result property="locationTime"    column="location_time"    />
+    </resultMap>
+
+    <resultMap id="disposeResult" type="shipDisposeData">
+        <id property="id" column="id"></id>
+        <result property="warningId" column="warning_id"/>
+        <result property="devideNo" column="devide_no"/>
+        <result property="disposeType" column="dispose_type"/>
+        <result property="disposeSuggestion" column="dispose_suggestion"/>
+        <result property="disposePicture" column="dispose_picture"/>
+        <result property="disposeUserId" column="dispose_user_id"/>
+        <result property="disposeTime" column="dispose_time"/>
     </resultMap>
 
     <select id="selectByDevideNo" parameterType="string" resultMap="ShipResult">
@@ -29,7 +41,7 @@
     </select>
 
     <update id="updateById" parameterType="shipArchivesData" >
-        update ax_bd_ship_archives
+        update ax_beidou_ship_archives
         <set>
             <if test="shipId != null and shipId != ''">ship_id = #{shipId},</if>
             <if test="shipType != null and shipType != ''">ship_type = #{shipType},</if>
@@ -44,13 +56,14 @@
             <if test="ownerCompany != null and ownerCompany != ''">owner_company = #{ownerCompany},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="modifyTime != null">modify_time = #{modifyTime},</if>
+            location_time = now(),
             <if test="ownerType != null and ownerType != ''">owner_type = #{ownerType}</if>
         </set>
         where devide_no = #{devideNo}
     </update>
 
     <insert id="insertShip" parameterType="shipArchivesData">
-        insert into ax_bd_ship_archives (
+        insert into ax_beidou_ship_archives (
         <if test="shipId != null and shipId != ''">ship_id,</if>
         <if test="devideNo != null and devideNo != ''">devide_no,</if>
         <if test="shipType != null and shipType != ''">ship_type,</if>
@@ -65,6 +78,7 @@
         <if test="ownerCompany != null and ownerCompany != ''">owner_company,</if>
         <if test="createTime != null">create_time,</if>
         <if test="modifyTime != null">modify_time,</if>
+        location_time,
         <if test="ownerType != null and ownerType != ''">owner_type</if>
         )values(
         <if test="shipId != null and shipId != ''">#{shipId},</if>
@@ -81,24 +95,29 @@
         <if test="ownerCompany != null and ownerCompany != ''">#{ownerCompany},</if>
         <if test="createTime != null">#{createTime},</if>
         <if test="modifyTime != null">#{modifyTime},</if>
+        now(),
         <if test="ownerType != null and ownerType != ''">#{ownerType}</if>
         )
     </insert>
     
     
     <select id="selectShipArchivesList" parameterType="shipArchivesREQ" resultMap="ShipResult">
-        select * from ax_bd_ship_archives archives INNER JOIN ax_beidou_dept dept
+        select archives.*,dept.pscmc as dept_name from ax_beidou_ship_archives archives INNER JOIN ax_beidou_dept dept
         where
             archives.police_station_id = dept.pscbh
-        <if test="shipId != null and shipId != ''">and archives.ship_id like concat('%', #{shipId},'%')</if>
-        <if test="devideNo != null and devideNo != ''">and archives.devide_no like concat('%', #{devideNo},'%')</if>
-        <if test="deptId != null and deptId != ''">and dept.xw_dept_id like cocat('%',#{deptId},'%')</if>
+        <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="shipType != null and shipType != ''">and ship_type = #{shipType}</if>
 
     </select>
 
 
     <select id="selectById" parameterType="string" resultMap="ShipResult">
-        select * from ax_bd_ship_archives where ship_id=#{shipId}
+        select archives.*,dept.pscmc as dept_name from ax_beidou_ship_archives archives INNER JOIN ax_beidou_dept dept
+        where archives.police_station_id = dept.pscbh and ship_id=#{shipId}
+    </select>
+
+    <select id="selectDisposeById" parameterType="string" resultMap="disposeResult">
+        select * from ax_beidou_ship_dispose where warning_id = #{warningId}
     </select>
 </mapper>

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

@@ -0,0 +1,83 @@
+<?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="cn.com.taiji.beidou.ship.status.mapper.ShipStatusMapper">
+
+    <resultMap id="shipStatusId" type="shipStatusData">
+        <id property="devideNo" column="devide_no"/>
+        <result property="isOnline" column="is_online"/>
+        <result property="isStasis" column="is_stasis"/>
+        <result property="longitude" column="longitude"/>
+        <result property="latitude" column="latitude"/>
+        <result property="location" column="location"/>
+        <result property="kwh" column="kwh"/>
+        <result property="lastTime" column="last_time"/>
+    </resultMap>
+
+    <resultMap id="shipStatusResult" type="shipStatusResult">
+        <id property="devideNo" column="devide_no"/>
+        <result property="isOnline" column="is_online"/>
+        <result property="isStasis" column="is_stasis"/>
+        <result property="longitude" column="longitude"/>
+        <result property="latitude" column="latitude"/>
+        <result property="location" column="location"/>
+        <result property="kwh" column="kwh"/>
+        <result property="lastTime" column="last_time"/>
+        <result     property="shipId"      column="ship_id"      />
+        <result property="shipType"     column="ship_type"     />
+        <result property="jobType"   column="job_type"   />
+        <result property="jobWay"    column="job_way"    />
+        <result property="ownerName"      column="owner_name"      />
+        <result property="ownerTelNo"    column="owner_tel_no"    />
+        <result property="shipLength"     column="ship_length"     />
+        <result property="shipWidth"   column="ship_width"   />
+        <result property="shipMaterial"    column="ship_material"    />
+        <result property="policeStationId"      column="police_station_id"      />
+        <result property="deptName"     column="dept_name"     />
+        <result property="ownerCompany"      column="owner_company"      />
+        <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="locationTime"    column="location_time"    />
+        <result property="numberDay"    column="number_day"    />
+    </resultMap>
+
+    <select id="selectById" parameterType="string" resultMap="shipStatusResult">
+        select st.is_online,st.is_stasis,st.longitude,st.latitude,st.location,st.last_time,
+				(CASE st.kwh WHEN 0 THEN "小于25%" WHEN 1 THEN "大于25%小于50%" WHEN 2 THEN "大于50%小于75%" ELSE "大于75%" END) as kwh,
+            archives.*,dept.pscmc as dept_name,TIMESTAMPDIFF(DAY,st.last_time,NOW()) as number_day from ax_beidou_ship_status st
+        inner join ax_beidou_ship_archives archives
+        inner join ax_beidou_dept dept
+        where st.devide_no = archives.devide_no and archives.police_station_id = dept.pscbh
+        <if test="devideNo != null and devideNo != ''">
+            and st.devide_no = #{devideNo}
+        </if>
+        <if test="isOnline != null and isOnline != ''">
+            and st.is_online = #{isOnline}
+        </if>
+        <if test="isStasis != null and isStasis != ''">
+            and st.is_stasis = #{isStasis}
+        </if>
+    </select>
+
+    <select id="selectShipStatusList" parameterType="shipStatusReq" resultMap="shipStatusResult">
+        select st.is_online,st.is_stasis,st.longitude,st.latitude,st.location,st.last_time,
+        (CASE st.kwh WHEN 0 THEN "小于25%" WHEN 1 THEN "大于25%小于50%" WHEN 2 THEN "大于50%小于75%" ELSE "大于75%" END) as kwh,
+        archives.*,dept.pscmc as dept_name,TIMESTAMPDIFF(DAY,st.last_time,NOW()) as number_day from ax_beidou_ship_status st
+        inner join ax_beidou_ship_archives archives
+        inner join ax_beidou_dept dept
+        where st.devide_no = archives.devide_no and archives.police_station_id = dept.pscbh
+        <if test="isOnline != null and isOnline != ''">
+            and st.is_online = #{isOnline}
+        </if>
+        <if test="isStasis != null and isStasis != ''">
+            and st.is_stasis = #{isStasis}
+        </if>
+        <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>
+    </select>
+
+</mapper>

beidou-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="configType != null and configType != ''">#{configType},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
- 			sysdate()
+ 			now()
 		)
     </insert>
 	 
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="configType != null and configType != ''">config_type = #{configType},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
- 			update_time = sysdate()
+ 			update_time = now()
         </set>
         where config_id = #{configId}
     </update>

beidou-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null and email != ''">#{email},</if>
  			<if test="status != null">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
+ 			now()
  		)
 	</insert>
 	
@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null">email = #{email},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+ 			update_time = now()
  		</set>
  		where dept_id = #{deptId}
 	</update>

beidou-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+ 			update_time = now()
  		</set>
  		where dict_code = #{dictCode}
 	</update>
@@ -117,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
+ 			now()
  		)
 	</insert>
 	

beidou-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+ 			update_time = now()
  		</set>
  		where dict_id = #{dictId}
 	</update>
@@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
+ 			now()
  		)
 	</insert>
 	

beidou-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<insert id="insertLogininfor" parameterType="SysLogininfor">
 		insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
-		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
+		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, now())
 	</insert>
 	
 	<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">

beidou-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -150,7 +150,7 @@
 			<if test="icon !=null and icon != ''">icon = #{icon},</if>
 			<if test="remark != null and remark != ''">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-			update_time = sysdate()
+			update_time = now()
 		</set>
 		where menu_id = #{menuId}
 	</update>
@@ -191,7 +191,7 @@
 		<if test="icon != null and icon != ''">#{icon},</if>
 		<if test="remark != null and remark != ''">#{remark},</if>
 		<if test="createBy != null and createBy != ''">#{createBy},</if>
-		sysdate()
+		now()
 		)
 	</insert>
 	

beidou-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != ''">#{status}, </if>
 			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
+ 			now()
 		)
     </insert>
 	 
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
             <if test="status != null and status != ''">status = #{status}, </if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+ 			update_time = now()
         </set>
         where notice_id = #{noticeId}
     </update>

beidou-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
 	<insert id="insertOperlog" parameterType="SysOperLog">
 		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time)
-        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate())
+        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, now())
 	</insert>
 	
 	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">

beidou-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+ 			update_time = now()
  		</set>
  		where post_id = #{postId}
 	</update>
@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
+ 			now()
  		)
 	</insert>
 	

beidou-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -117,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
+ 			now()
  		)
 	</insert>
 	
@@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+ 			update_time = now()
  		</set>
  		where role_id = #{roleId}
 	</update>

beidou-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -176,10 +176,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
- 			sysdate()
+ 			now()
  		)
 	</insert>
-	
+
 	<update id="updateUser" parameterType="SysUser">
  		update sys_user
  		<set>
@@ -196,7 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
- 			update_time = sysdate()
+ 			update_time = now()
  		</set>
  		where user_id = #{userId}
 	</update>