船舶档案、重点关注接口

beidou-admin/pom.xml

@@ -79,6 +79,12 @@
             <artifactId>beidou-generator</artifactId>
         </dependency>
 
+        <!--船舶信息模块-->
+        <dependency>
+            <groupId>cn.com.taiji</groupId>
+            <artifactId>beidou-ship</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

beidou-admin/src/main/java/cn/com/taiji/beidou/Application.java

@@ -4,6 +4,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * 启动程序
@@ -12,6 +13,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  */
 @MapperScan("cn.com.taiji.**.mapper")
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@EnableScheduling
 public class Application
 {
     public static void main(String[] args)

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

@@ -0,0 +1,82 @@
+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.domain.model.LoginUser;
+import cn.com.taiji.beidou.common.core.page.TableDataInfo;
+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.FocusShipResult;
+import cn.com.taiji.beidou.ship.focus.service.FocusShipService;
+import io.swagger.annotations.Api;
+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 javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/9 18:16
+ */
+@Api(tags = "重点关注船舶")
+@RestController
+public class FocusShipController extends BaseController {
+
+    @Resource
+    private FocusShipService focusShipService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @ApiOperation("新增关注船舶")
+    @PostMapping("/addFocusShip")
+    public R addFocusShip(@RequestBody FocusShipData focusShipData, HttpServletRequest request){
+        try{
+            LoginUser loginUser = tokenService.getLoginUser(request);
+            focusShipData.setUserId(loginUser.getUserId().toString());
+            focusShipService.insertFocusShip(focusShipData);
+            return R.ok();
+        }catch (Exception e){
+            return R.fail(e.getMessage());
+        }
+    }
+
+    @ApiOperation("移除关注船舶")
+    @PostMapping("/delFocusShip")
+    public R delFocusShip(Integer focusId){
+        try{
+            focusShipService.deleteFocusShip(focusId);
+            return R.ok();
+        }catch (Exception e){
+            return R.fail(e.getMessage());
+        }
+    }
+
+    @ApiOperation("关注船舶详情")
+    @PostMapping("/findFocusShip")
+    public R findFocusShip(Integer focusId){
+        try{
+            return R.ok(focusShipService.selectById(focusId));
+        }catch (Exception e){
+            return R.fail(e.getMessage());
+        }
+    }
+
+    @ApiOperation("关注船舶列表")
+    @PostMapping("/focusShipList")
+    public TableDataInfo findFocusShipList(Integer pageNum, Integer pageSize){
+        try{
+            startPage();
+            List<FocusShipResult> results = focusShipService.selectList();
+            return getDataTable(results);
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,62 @@
+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.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.service.ShipArchivesService;
+import com.github.pagehelper.PageHelper;
+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/8 18:55
+ */
+@RestController
+public class ShipArchivesController extends BaseController {
+
+    @Resource
+    private ShipArchivesService shipArchivesService;
+
+    @Resource
+    private BeiDouShipInfo beiDouShipInfo;
+
+    @ApiOperation("获取船舶档案列表")
+    @PostMapping("/shipList")
+    public TableDataInfo getShip(@RequestBody ShipArchivesREQ req,Integer pageNum,Integer pageSize){
+        startPage();
+        List<ShipArchivesData> shipList = shipArchivesService.findShipList(req);
+        return getDataTable(shipList);
+
+    }
+
+    @ApiOperation("获取船舶详情")
+    @PostMapping("/shipDetail")
+    public R<ShipArchivesData> findShipDetail(String shipId){
+
+        try {
+            ShipArchivesData shipById = shipArchivesService.findShipById(shipId);
+            return R.ok(shipById);
+        }catch (Exception e){
+            return R.fail(e.getMessage());
+        }
+
+    }
+
+    //@ApiOperation("获取船舶档案信息")
+    @GetMapping("/shipInfo")
+    public R shipInfo(){
+        beiDouShipInfo.beidouShipInfo();
+        return null;
+    }
+}

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

@@ -37,8 +37,6 @@ public class SysLoginController
     @Autowired
     private SysPermissionService permissionService;
 
-    @Autowired
-    private ISysUserService userService;
 
     /**
      * 登录方法

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

@@ -117,7 +117,7 @@ public class SysLoginService
     public String loginByCode(String mobile,  String code)
     {
         //验证短信验证码
-        String cacheCode = redisCache.getCacheObject(mobile).toString();
+        String cacheCode = redisCache.getCacheObject(mobile)+"";
         if(!code.equals(cacheCode)){
             return "验证码错误！";
         }

beidou-ship/pom.xml

@@ -18,7 +18,15 @@
             <groupId>cn.com.taiji</groupId>
             <artifactId>beidou-common</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <version>3.0.5</version>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -0,0 +1,71 @@
+package cn.com.taiji.beidou.ship.archives;
+
+import cn.com.taiji.beidou.ship.archives.domain.ShipArchivesData;
+import cn.com.taiji.beidou.ship.archives.domain.ShipInfoParam;
+import cn.com.taiji.beidou.ship.archives.mapper.ShipArchivesMapper;
+import cn.com.taiji.beidou.ship.feign.OpenServiceFeign;
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+@Slf4j
+public class BeiDouShipInfo {
+
+    @Autowired(required = false)
+    private OpenServiceFeign openServiceFeign;
+
+    @Resource
+    private ShipArchivesMapper shipArchivesMapper;
+
+    /**
+     * 每个一小时执行一次
+     */
+
+    @Scheduled(cron = "0 0 */1 * * ?")
+    public void beidouShipInfo(){
+
+        log.info("start update ship info message 。。。");
+        int page = 1 ;
+        int pageSize = 100;
+        int pageCount;
+        ShipInfoParam param = new ShipInfoParam();
+        param.setPage(page);
+        param.setPageSize(pageSize);
+
+        try {
+            do {
+                String result = this.openServiceFeign.shipInfo(JSONObject.toJSONString(param)).toJSONString();
+                JSONObject resultData = JSON.parseObject(result);
+                JSONObject data = JSON.parseObject(resultData.getString("data"));
+                Integer totalSize = data.getInteger("totalSize");
+                JSONArray shipInfoData = JSON.parseArray(data.getString("data"));
+                for (int n=0;n<shipInfoData.size();n++){
+                    String shipInfo = shipInfoData.get(n).toString();
+                    ShipArchivesData shipArchivesData = JSON.parseObject(shipInfo,ShipArchivesData.class);
+                    ShipArchivesData shipArchives = shipArchivesMapper.selectByDevideNo(shipArchivesData.getDevideNo());
+                    if(shipArchives!=null && shipArchives.getDevideNo()!=null){
+                        shipArchivesMapper.updateById(shipArchivesData);
+                    }else {
+                        shipArchivesMapper.insertShip(shipArchivesData);
+                    }
+
+                }
+                pageCount = totalSize/pageSize + 1;
+                page++;
+                param.setPage(page);
+            }while (page<=pageCount);
+            log.info("count ："+page+"time；  successful！");
+        }catch (Exception e){
+            e.printStackTrace();
+            log.info("sql insert exception："+e.getMessage());
+        }
+
+    }
+}

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

@@ -0,0 +1,71 @@
+package cn.com.taiji.beidou.ship.archives.domain;
+
+import lombok.Data;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/9 9:21
+ */
+@Data
+public class ShipArchivesData {
+    /**
+     * 船舶id 如：儋0602365
+     */
+    private String shipId;
+    /**
+     * 北斗设备号
+     */
+    private String devideNo;
+    /**
+     * 船舶类型
+     */
+    private String shipType;
+    /**
+     * 作业类型
+     */
+    private String jobType;
+    /**
+     * 作业方式
+     */
+    private String jobWay;
+    /**
+     * 船主
+     */
+    private String ownerName;
+    /**
+     * 船主电话
+     */
+    private String ownerTelNo;
+    /**
+     * 船长
+     */
+    private double shipLength;
+    /**
+     * 船宽
+     */
+    private double shipWidth;
+    /**
+     * 船舶材质
+     */
+    private String shipMaterial;
+    /**
+     * 所属管理单位
+     */
+    private String policeStationId;
+    /**
+     * 船主单位
+     */
+    private String ownerCompany;
+    /**
+     * 创建时间
+     */
+    private long createTime;
+    /**
+     * 修改时间
+     */
+    private long modifyTime;
+    /**
+     * 船主类型
+     */
+    private String ownerType;
+}

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

@@ -0,0 +1,17 @@
+package cn.com.taiji.beidou.ship.archives.domain;
+
+import lombok.Data;
+
+/**
+ * 按类型查询
+ * @Author CHEN
+ * @Date 2022/11/9 10:24
+ */
+@Data
+public class ShipArchivesREQ {
+
+    private String shipType;
+    private String jobType;
+    private String ownerType;
+    private String jobWay;
+}

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

@@ -0,0 +1,12 @@
+package cn.com.taiji.beidou.ship.archives.domain;
+
+import lombok.Data;
+
+@Data
+public class ShipInfoParam {
+
+    private Integer page;
+    private Integer pageSize;
+    private String shipNo;
+    private String devideNo;
+}

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

@@ -0,0 +1,50 @@
+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 org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/9 9:55
+ */
+@Mapper
+public interface ShipArchivesMapper{
+
+    /**
+     * 根据北斗设备号查询
+     * @param devideNo
+     * @return
+     */
+    ShipArchivesData selectByDevideNo(String devideNo);
+
+    /**
+     * 更新
+     * @param shipArchivesData
+     */
+    void updateById(ShipArchivesData shipArchivesData);
+
+    /**
+     * 插入
+     * @param shipArchivesData
+     * @return
+     */
+    int insertShip(ShipArchivesData shipArchivesData);
+
+    /**
+     * 查询船舶档案列表
+     * @param shipArchivesREQ
+     * @return
+     */
+    List<ShipArchivesData> selectShipArchivesList(ShipArchivesREQ shipArchivesREQ);
+
+    /**
+     * 船只详情
+     * @param shipId
+     * @return
+     */
+    ShipArchivesData selectById(String shipId);
+
+}

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

@@ -0,0 +1,23 @@
+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 java.util.List;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/8 19:14
+ */
+public interface ShipArchivesService{
+
+    List<ShipArchivesData> findShipList(ShipArchivesREQ req);
+
+    /**
+     * 船只详情
+     * @param shipId
+     * @return
+     */
+    ShipArchivesData findShipById(String shipId);
+}

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

@@ -0,0 +1,32 @@
+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.mapper.ShipArchivesMapper;
+import cn.com.taiji.beidou.ship.archives.service.ShipArchivesService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/9 9:45
+ */
+@Service
+public class ShipArchivesServiceImpl implements ShipArchivesService {
+
+    @Resource
+    private ShipArchivesMapper shipArchivesMapper;
+
+    @Override
+    public List<ShipArchivesData> findShipList(ShipArchivesREQ req) {
+        List<ShipArchivesData> list = shipArchivesMapper.selectShipArchivesList(req);
+        return list;
+    }
+
+    @Override
+    public ShipArchivesData findShipById(String shipId) {
+        return shipArchivesMapper.selectById(shipId);
+    }
+}

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/config/OpenFeignConfig.java

@@ -0,0 +1,40 @@
+package cn.com.taiji.beidou.ship.config;
+
+import cn.com.taiji.beidou.ship.feign.FastjsonFeignDecoder;
+import cn.com.taiji.beidou.ship.feign.FastjsonFeignEncoder;
+import cn.com.taiji.beidou.ship.feign.OpenServiceFeign;
+import com.alibaba.fastjson2.JSONObject;
+import feign.Feign;
+import feign.Logger;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Slf4j
+public class OpenFeignConfig {
+
+    private String url="http://47.100.82.30";
+
+    //@ConditionalOnProperty(value = "true")
+    @Bean
+    OpenServiceFeign openServiceFeign() {
+        return Feign.builder()
+                .decoder(new FastjsonFeignDecoder())
+                .encoder(new FastjsonFeignEncoder())
+                .logLevel(Logger.Level.FULL)
+                .logger(this.getLogger())
+                .target(OpenServiceFeign.class, this.url);
+    }
+
+    public Logger getLogger() {
+        return new Logger() {
+            @Override
+            protected void log(String s, String s1, Object... objects) {
+                log.debug("OpenFeignConfig >>>> OpenFeign日志：\n{}", JSONObject.toJSONString(objects));
+            }
+        };
+    }
+}

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/feign/FastjsonFeignDecoder.java

@@ -0,0 +1,45 @@
+package cn.com.taiji.beidou.ship.feign;
+
+import com.alibaba.fastjson2.JSONObject;
+import feign.FeignException;
+import feign.Response;
+import feign.Util;
+import feign.codec.Decoder;
+import lombok.extern.slf4j.Slf4j;
+
+import java.lang.reflect.Type;
+
+/**
+ * @Description:
+ * @Author: hujie@umisoft.cn
+ * @Date: 2020/4/8 6:31 PM
+ */
+@Slf4j
+public class FastjsonFeignDecoder implements Decoder {
+
+    @Override
+    public Object decode(Response response, Type type) throws FeignException {
+        if (response.status() == 404) {
+            this.error("404错误");
+            return Util.emptyValueOf(type);
+        } else if (response.body() == null) {
+            this.debug("检测到body区域数据为空");
+            return null;
+        }
+        try {
+            String result = Util.toString(response.body().asReader());
+            this.debug(result);
+            return JSONObject.parse(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public void debug(String message) {
+        log.debug("FastjsonFeignDecoder >>>> 远端返回数据为：\n{}", message);
+    }
+    public void error(String message) {
+        log.error("FastjsonFeignDecoder >>>> 发生错误：\n{}", message);
+    }
+}

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/feign/FastjsonFeignEncoder.java

@@ -0,0 +1,25 @@
+package cn.com.taiji.beidou.ship.feign;
+
+import feign.RequestTemplate;
+import feign.codec.EncodeException;
+import feign.codec.Encoder;
+
+import java.lang.reflect.Type;
+
+/**
+ * @Description:
+ * @Author: hujie@umisoft.cn
+ * @Date: 2021/10/8 11:42 上午
+ */
+public class FastjsonFeignEncoder implements Encoder {
+
+    public FastjsonFeignEncoder() { }
+
+    @Override
+    public void encode(Object o, Type type, RequestTemplate requestTemplate) throws EncodeException {
+//        String requestJSON = JSONObject.toJSONString(o);
+//        Map<String, Collection<String>> headerMap = requestTemplate.headers();
+//        List<String> contentTypes = (List<String>) headerMap.get("Content-Type");
+//        TODO 该位置可全局参数，例如认证 token，同时可依据特殊请求参数，做相应的特殊处理
+    }
+}

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/feign/OpenServiceFeign.java

@@ -0,0 +1,24 @@
+package cn.com.taiji.beidou.ship.feign;
+
+import com.alibaba.fastjson2.JSONObject;
+import feign.Body;
+import feign.Headers;
+import feign.Param;
+import feign.RequestLine;
+
+/**
+ * @author CHEN
+ */
+public interface OpenServiceFeign {
+
+    /**
+     * 船舶档案数据
+     * @param body
+     * @return
+     */
+    @RequestLine("POST /ship/bd/shipInfo/third/query")
+    @Headers({"Content-Type: application/json"})
+    @Body("{body}")
+    JSONObject shipInfo(@Param("body") String body);
+
+}

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

@@ -0,0 +1,17 @@
+package cn.com.taiji.beidou.ship.focus.domain;
+
+import lombok.Data;
+
+import java.sql.Date;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/9 18:00
+ */
+@Data
+public class FocusShipData {
+    private Integer focusId;
+    private String shipId;
+    private String userId;
+    private Date createTime;
+}

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

@@ -0,0 +1,81 @@
+package cn.com.taiji.beidou.ship.focus.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/9 18:58
+ */
+@Data
+public class FocusShipResult {
+
+    private Integer focusId;
+    private String userId;
+
+    @JsonFormat(shape =JsonFormat.Shape.STRING,pattern ="yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
+    private Date focusCreate;
+    /**
+     * 船舶id 如：儋0602365
+     */
+    private String shipId;
+    /**
+     * 北斗设备号
+     */
+    private String devideNo;
+    /**
+     * 船舶类型
+     */
+    private String shipType;
+    /**
+     * 作业类型
+     */
+    private String jobType;
+    /**
+     * 作业方式
+     */
+    private String jobWay;
+    /**
+     * 船主
+     */
+    private String ownerName;
+    /**
+     * 船主电话
+     */
+    private String ownerTelNo;
+    /**
+     * 船长
+     */
+    private double shipLength;
+    /**
+     * 船宽
+     */
+    private double shipWidth;
+    /**
+     * 船舶材质
+     */
+    private String shipMaterial;
+    /**
+     * 所属管理单位
+     */
+    private String policeStationId;
+    /**
+     * 船主单位
+     */
+    private String ownerCompany;
+    /**
+     * 创建时间
+     */
+    private long createTime;
+    /**
+     * 修改时间
+     */
+    private long modifyTime;
+    /**
+     * 船主类型
+     */
+    private String ownerType;
+}

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/focus/mapper/FocusShipMapper.java

@@ -0,0 +1,37 @@
+package cn.com.taiji.beidou.ship.focus.mapper;
+
+import cn.com.taiji.beidou.ship.focus.domain.FocusShipData;
+import cn.com.taiji.beidou.ship.focus.domain.FocusShipResult;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/9 18:03
+ */
+@Mapper
+public interface FocusShipMapper {
+
+    int insertFocusShip(FocusShipData focusShipData);
+
+    /**
+     * 移除关注船舶
+     * @param focusId
+     * @return
+     */
+    int deleteFocusShip(Integer focusId);
+
+    /**
+     * 获取详情
+     * @param focusId
+     * @return
+     */
+    FocusShipResult selectById(Integer focusId);
+
+    /**
+     * 列表
+     * @return
+     */
+    List<FocusShipResult> selectList();
+}

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/focus/service/FocusShipService.java

@@ -0,0 +1,34 @@
+package cn.com.taiji.beidou.ship.focus.service;
+
+import cn.com.taiji.beidou.ship.focus.domain.FocusShipData;
+import cn.com.taiji.beidou.ship.focus.domain.FocusShipResult;
+
+import java.util.List;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/9 18:13
+ */
+public interface FocusShipService {
+    int insertFocusShip(FocusShipData focusShipData);
+
+    /**
+     * 移除关注船舶
+     * @param focusId
+     * @return
+     */
+    int deleteFocusShip(Integer focusId);
+
+    /**
+     * 关注船舶详情
+     * @param focusId
+     * @return
+     */
+    FocusShipResult selectById(Integer focusId);
+
+    /**
+     * 列表
+     * @return
+     */
+    List<FocusShipResult> selectList();
+}

beidou-ship/src/main/java/cn/com/taiji/beidou/ship/focus/service/impl/FocusShipServiceImpl.java

@@ -0,0 +1,41 @@
+package cn.com.taiji.beidou.ship.focus.service.impl;
+
+import cn.com.taiji.beidou.ship.focus.domain.FocusShipData;
+import cn.com.taiji.beidou.ship.focus.domain.FocusShipResult;
+import cn.com.taiji.beidou.ship.focus.mapper.FocusShipMapper;
+import cn.com.taiji.beidou.ship.focus.service.FocusShipService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author CHEN
+ * @Date 2022/11/9 18:13
+ */
+@Service
+public class FocusShipServiceImpl implements FocusShipService {
+
+    @Resource
+    private FocusShipMapper focusShipMapper;
+
+    @Override
+    public int insertFocusShip(FocusShipData focusShipData) {
+        return focusShipMapper.insertFocusShip(focusShipData);
+    }
+
+    @Override
+    public int deleteFocusShip(Integer focusId) {
+        return focusShipMapper.deleteFocusShip(focusId);
+    }
+
+    @Override
+    public FocusShipResult selectById(Integer focusId) {
+        return focusShipMapper.selectById(focusId);
+    }
+
+    @Override
+    public List<FocusShipResult> selectList() {
+        return focusShipMapper.selectList();
+    }
+}

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

@@ -0,0 +1,58 @@
+<?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.focus.mapper.FocusShipMapper">
+
+    <resultMap id="focusShipDetail" type="focusShipResult">
+        <id     property="focusId"      column="focus_id"      />
+        <result property="userId"    column="user_id"    />
+        <result property="focusCreate"     column="focus_create"     />
+        <result property="shipId"      column="ship_id"      />
+        <result property="devideNo"    column="devide_no"    />
+        <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="ownerCompany"      column="owner_company"      />
+        <result property="createTime"    column="create_time"    />
+        <result property="modifyTime"      column="modify_time"      />
+        <result property="ownerType"    column="owner_type"    />
+    </resultMap>
+
+    <insert id="insertFocusShip" parameterType="focusShipData">
+        insert bd_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()
+        )
+    </insert>
+
+    <delete id="deleteFocusShip" parameterType="integer">
+        delete from bd_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 bd_ship_archives archives,bd_focus_ship focus
+        <where>
+            archives.ship_id = focus.ship_id
+            and focus.focus_id = #{focusId}
+        </where>
+    </select>
+
+    <select id="selectList"  resultMap="focusShipDetail">
+        select focus.user_id,focus.focus_id,focus.create_time as focus_create,archives.* from bd_ship_archives archives,bd_focus_ship focus
+        <where>
+            archives.ship_id = focus.ship_id
+        </where>
+    </select>
+</mapper>

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

@@ -0,0 +1,98 @@
+<?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.archives.mapper.ShipArchivesMapper">
+
+    <resultMap type="shipArchivesData" id="ShipResult">
+        <id     property="shipId"      column="ship_id"      />
+        <result property="devideNo"    column="devide_no"    />
+        <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="ownerCompany"      column="owner_company"      />
+        <result property="createTime"    column="create_time"    />
+        <result property="modifyTime"      column="modify_time"      />
+        <result property="ownerType"    column="owner_type"    />
+    </resultMap>
+
+    <select id="selectByDevideNo" parameterType="string" resultMap="ShipResult">
+        select * from bd_ship_archives where devide_no=#{devideNo}
+    </select>
+
+    <update id="updateById" parameterType="shipArchivesData" >
+        update bd_ship_archives
+        <set>
+            <if test="shipId != null and shipId != ''">ship_id = #{shipId},</if>
+            <if test="shipType != null and shipType != ''">ship_type = #{shipType},</if>
+            <if test="jobType != null and jobType != ''">job_type = #{jobType},</if>
+            <if test="jobWay != null and jobWay != ''">job_way = #{jobWay},</if>
+            <if test="ownerName != null and ownerName != ''">owner_name = #{ownerName},</if>
+            <if test="ownerTelNo != null and ownerTelNo != ''">owner_tel_no = #{ownerTelNo},</if>
+            <if test="shipLength != null">ship_length = #{shipLength},</if>
+            <if test="shipWidth != null">ship_width = #{shipWidth},</if>
+            <if test="shipMaterial != null">ship_material = #{shipMaterial},</if>
+            <if test="policeStationId != null and policeStationId != ''">police_station_id = #{policeStationId},</if>
+            <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>
+            <if test="ownerType != null and ownerType != ''">owner_type = #{ownerType}</if>
+        </set>
+        where devide_no = #{devideNo}
+    </update>
+
+    <insert id="insertShip" parameterType="shipArchivesData">
+        insert into bd_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>
+        <if test="jobType != null and jobType != ''">job_type,</if>
+        <if test="jobWay != null and jobWay != ''">job_way,</if>
+        <if test="ownerName != null and ownerName != ''">owner_name,</if>
+        <if test="ownerTelNo != null and ownerTelNo != ''">owner_tel_no,</if>
+        <if test="shipLength != null">ship_length,</if>
+        <if test="shipWidth != null">ship_width,</if>
+        <if test="shipMaterial != null">ship_material,</if>
+        <if test="policeStationId != null and policeStationId != ''">police_station_id,</if>
+        <if test="ownerCompany != null and ownerCompany != ''">owner_company,</if>
+        <if test="createTime != null">create_time,</if>
+        <if test="modifyTime != null">modify_time,</if>
+        <if test="ownerType != null and ownerType != ''">owner_type</if>
+        )values(
+        <if test="shipId != null and shipId != ''">#{shipId},</if>
+        <if test="devideNo != null and devideNo != ''">#{devideNo},</if>
+        <if test="shipType != null and shipType != ''">#{shipType},</if>
+        <if test="jobType != null and jobType != ''">#{jobType},</if>
+        <if test="jobWay != null and jobWay != ''">#{jobWay},</if>
+        <if test="ownerName != null and ownerName != ''">#{ownerName},</if>
+        <if test="ownerTelNo != null and ownerTelNo != ''">#{ownerTelNo},</if>
+        <if test="shipLength != null">#{shipLength},</if>
+        <if test="shipWidth != null">#{shipWidth},</if>
+        <if test="shipMaterial != null">#{shipMaterial},</if>
+        <if test="policeStationId != null and policeStationId != ''">#{policeStationId},</if>
+        <if test="ownerCompany != null and ownerCompany != ''">#{ownerCompany},</if>
+        <if test="createTime != null">#{createTime},</if>
+        <if test="modifyTime != null">#{modifyTime},</if>
+        <if test="ownerType != null and ownerType != ''">#{ownerType}</if>
+        )
+    </insert>
+    
+    
+    <select id="selectShipArchivesList" parameterType="shipArchivesREQ" resultMap="ShipResult">
+        select * from bd_ship_archives
+        <where>
+            <if test="shipType != null and shipType != ''">ship_type = #{shipType}</if>
+        </where>
+    </select>
+
+
+    <select id="selectById" parameterType="string" resultMap="ShipResult">
+        select * from bd_ship_archives where ship_id=#{shipId}
+    </select>
+</mapper>

pom.xml

@@ -184,6 +184,13 @@
                 <version>${beidou.version}</version>
             </dependency>
 
+            <!-- 北斗船舶-->
+            <dependency>
+                <groupId>cn.com.taiji</groupId>
+                <artifactId>beidou-ship</artifactId>
+                <version>${beidou.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>