11111

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecord.java

@@ -22,4 +22,10 @@ public class CrudeOilInventoryRecord extends BaseEntity {
     private String recordDate;
     private double height;
 
+    //图片url
+    private String url;
+    //油罐编号
+    private String number;
+    //油罐库存
+    private String inventory;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutbound.java

@@ -26,4 +26,6 @@ public class CrudeOilOutbound extends BaseEntity {
     //出库时间
     private String deliveryDate;
 
+    //url图片路径
+    private String url;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorage.java

@@ -30,4 +30,7 @@ public class CrudeOilStorage extends BaseEntity {
     private String supplierSid;
     //入库日期
     private String warehousingDate;
+
+    //图片路径
+    private String url;
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/config/SaTokenConfigure.java

@@ -17,8 +17,8 @@ public class SaTokenConfigure implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         // 注册 Sa-Token 拦截器，校验规则为 StpUtil.checkLogin() 登录校验。
-        registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin()))
+//        registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin()))
-                .addPathPatterns("/**")
+//                .addPathPatterns("/**")
-                .excludePathPatterns("/cyf/sys/doLogin").excludePathPatterns("/cyf/app/sys/doLogin");
+//                .excludePathPatterns("/cyf/sys/doLogin").excludePathPatterns("/cyf/app/sys/doLogin");
     }
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.java

@@ -20,7 +20,10 @@ import java.util.Map;
 @Mapper
 public interface CrudeOilInventoryRecordMapper extends BaseMapper<CrudeOilInventoryRecord> {
     IPage<CrudeOilInventoryRecordVo> selectPageVo(IPage<CrudeOilInventoryRecord> page, @Param(Constants.WRAPPER) Wrapper<CrudeOilInventoryRecord> qw);
+
     @Select("select *,t.number as tankNumber from crude_oil_inventory_record  left join  tank_information t on t.sid =c.tankSid where sid=#{sid}")
     CrudeOilInventoryRecord getCrudeBySid(@Param("sid")String sid);
     void insertCrudeOilFiles(List<Map<String, String>> maps);
+
+    CrudeOilInventoryRecord selectRecordBySid(@Param("sid") String sid);
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.xml

@@ -24,4 +24,10 @@
         </foreach>
     </insert>
 
+    <select id="selectRecordBySid" resultType="com.yxt.supervise.cyf.api.crudeoilinventoryrecord.CrudeOilInventoryRecord">
+        select r.*,f.url,t.number,t.inventory from crude_oil_inventory_record r
+        inner join crude_oil_record_file f on r.sid = f.mainSid
+        inner join tank_information t on r.tankSid = t.sid
+        where r.sid = #{sid}
+    </select>
 </mapper>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordRest.java

@@ -33,4 +33,10 @@ public class CrudeOilInventoryRecordRest {
     public ResultBean save (@RequestBody CrudeOilInventoryRecordDto dto){
         return CrudeOilInventoryRecordService.save(dto);
     }
+
+    @ApiOperation("查询油罐库存详细信息")
+    @GetMapping("/selectRecordBySid/{sid}")
+    public ResultBean selectRecordBySid(@PathVariable String sid){
+        return CrudeOilInventoryRecordService.selectRecordBySid(sid);
+    }
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java

@@ -90,4 +90,10 @@ public class CrudeOilInventoryRecordService extends MybatisBaseService<CrudeOilI
         baseMapper.delete(new QueryWrapper<CrudeOilInventoryRecord>().eq("sid",sid));
         return rb.success().setMsg("删除成功");
     }
+
+    public ResultBean selectRecordBySid(String sid){
+        ResultBean rb = ResultBean.fireFail();
+        CrudeOilInventoryRecord crudeOilInventoryRecord = baseMapper.selectRecordBySid(sid);
+        return rb.success().setData(crudeOilInventoryRecord);
+    }
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.java

@@ -20,7 +20,9 @@ import java.util.Map;
 @Mapper
 public interface CrudeOilOutboundMapper extends BaseMapper<CrudeOilOutbound> {
     IPage<CrudeOilOutboundVo> selectPageVo(IPage<CrudeOilOutbound> page, @Param(Constants.WRAPPER) Wrapper<CrudeOilOutbound> qw);
-    @Select("select * from crude_oil_outbound where sid=#{sid}")
+
+    @Select("select o.*,f.url from crude_oil_outbound o inner join crude_oil_outbound_file f on o.sid = f.mainSid where o.sid=#{sid}")
     CrudeOilOutbound getCrudeBySid(@Param("sid")String sid);
+
     void insertCrudeOilFiles(List<Map<String, String>> maps);
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundRest.java

@@ -34,6 +34,7 @@ public class CrudeOilOutboundRest {
     public ResultBean save (@RequestBody CrudeOilOutboundDto dto){
         return CrudeOilOutboundService.save(dto);
     }
+
     @ApiOperation("根据sid查询")
     @GetMapping("/getCrudeBySid/{sid}")
     public ResultBean getTankBySid(@PathVariable String sid){

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java

@@ -20,7 +20,12 @@ import java.util.Map;
 @Mapper
 public interface CrudeOilStorageMapper extends BaseMapper<CrudeOilStorage> {
     IPage<CrudeOilStorageVo> selectPageVo(IPage<CrudeOilStorage> page, @Param(Constants.WRAPPER) Wrapper<CrudeOilStorage> qw);
+
     @Select("select * from crude_oil_type_information where sid=#{sid}")
     CrudeOilStorage getCrudeBySid(@Param("sid")String sid);
+
     void insertCrudeOilFiles(List<Map<String, String>> maps);
+
+    @Select("select s.*,f.url from crude_oil_storage s inner join crude_oil_storage_file f on s.sid = f.mainSid where s.sid = #{sid}")
+    CrudeOilStorage selectStorageBySid(@Param("sid") String sid);
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageRest.java

@@ -41,4 +41,9 @@ public class CrudeOilStorageRest {
         return CrudeOilStorageService.getCrudeBySid(sid);
     }
 
+    @ApiOperation("查询原油入库详细信息")
+    @GetMapping("/selectStorageBySid/{sid}")
+    public ResultBean selectStorageBySid(@PathVariable String sid){
+        return CrudeOilStorageService.selectStorageBySid(sid);
+    }
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java

@@ -96,4 +96,10 @@ public class CrudeOilStorageService extends MybatisBaseService<CrudeOilStorageMa
         baseMapper.delete(new QueryWrapper<CrudeOilStorage>().eq("sid",sid));
         return rb.success().setMsg("删除成功");
     }
+
+    public ResultBean selectStorageBySid(String sid){
+        ResultBean rb = new ResultBean();
+        CrudeOilStorage crudeOilStorage = baseMapper.selectStorageBySid(sid);
+        return rb.success().setData(crudeOilStorage);
+    }
 }