轨道衡一次数据补入修改、静态铁水衡和吊钩秤委托倒序查询

pom.xml

@@ -63,29 +63,25 @@
                 <filtering>false</filtering>
             </resource>
         </resources>
-
+		
         <plugins>
+			<!--数据库链接、目标路径、数据库用户、数据库密码-->
+			<!-- 一对一 一对多的配置文件generatorConfig.xml 请填写- - -绝对路经	-->
+						<!-- 配置文件模版位置在 generator-maven-plugin-3.0.jar 包的主目录下 -->
+						<!--<xmlProject>${project.basedir}\src\main\resources\generatorConfig.xml</xmlProject>-->
+						<!-- 表生成model默认生成驼峰式：sys_user->SysUser，如果需要生成其它名字可以用逗号分隔：sys_user,User -->
+			<!--
             <plugin>
                 <groupId>com.steerinfo</groupId>
                 <artifactId>generator-maven-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <!--数据库链接、目标路径、数据库用户、数据库密码-->
                     <connUrl>jdbc:oracle:thin:@10.99.200.87:1521/jgwzjl</connUrl>
                     <targetPackage>com.steerinfo.baseinfo</targetPackage>
                     <user>lims</user>
                     <password>lims_2021</password>
-                    <!-- 一对一 一对多的配置文件generatorConfig.xml 请填写- - -绝对路经	-->
-                    <!-- 配置文件模版位置在 generator-maven-plugin-3.0.jar 包的主目录下 -->
-                    <!--<xmlProject>${project.basedir}\src\main\resources\generatorConfig.xml</xmlProject>-->
-                    <!-- 表生成model默认生成驼峰式：sys_user->SysUser，如果需要生成其它名字可以用逗号分隔：sys_user,User -->
                     <tables>
-
-
                         <params>app_verification_code</params>
-
-
-
                     </tables>
                 </configuration>
                 <executions>
@@ -97,6 +93,7 @@
                     </execution>
                 </executions>
             </plugin>
+			-->
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

src/main/java/com/steerinfo/baseinfo/combaseinfo/mapper/ComBaseInfoMapper.java

@@ -26,4 +26,6 @@ public interface ComBaseInfoMapper extends IBaseMapper<ComBaseInfo, String> {
 
     /*按照表名和主键生成当前最大的序列号(五位)*/
     String getConfigIDByFive(@Param(value = "tablName") String tablName, @Param(value = "primaryKey") String primaryKey);
+
+    List<String> matterNoByBaseCode(Map<String,Object> map);
 }

src/main/java/com/steerinfo/baseinfo/combaseinfo/mapper/ComBaseInfoMapper.xml

@@ -553,4 +553,13 @@
     FROM ${tablName}
     where instr(${primaryKey}, to_char(sysdate, 'yyyyMMdd')) > 0 and length(${primaryKey})= 13
   </select>
+
+  <select id="matterNoByBaseCode" parameterType="java.util.HashMap" resultType="java.lang.String">
+    select memo
+    from com_base_info
+    where 1=1
+    <if test="pBaseCode != null and pBaseCode != ''">
+      and p_base_code = #{pBaseCode, jdbcType=VARCHAR}
+    </if>
+  </select>
 </mapper>

src/main/java/com/steerinfo/filter/SecurityFilter.java

@@ -35,16 +35,19 @@ public class SecurityFilter implements Filter {
         String method = request.getMethod();
         StringBuffer url = request.getRequestURL();
         //不拦截
+        ///apifox导入请求路径：v2/api-docs
         if ("/jgjl/v1/meterbasecars/appregister".equals(path)
-                ||"/jgjl/v1/meterbasecars/applogin".equals(path)){
+                ||"/jgjl/v1/meterbasecars/applogin".equals(path)
+                ||"/v2/api-docs".equals(path)){
             filterChain.doFilter(servletRequest,servletResponse);
             return;
         }
+
         //邓义晶：10.104.4.105  app：10.1.201.188
         //app:https://app.jiugang.com/jgjl/v1/meterbasecars/applogin
         //网页代理ip：https://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1/meterbasecars/applogin
         //本地：http://10.104.4.105:9004/v1/meterbasecars/applogin
-        if(request.getRemoteAddr().equals("10.1.201.188")) {
+        if(request.getRemoteAddr().equals("10.1.201.188") ||request.getRemoteAddr().equals("10.104.4.105")) {
             filterChain.doFilter(servletRequest,servletResponse);
             return;
         }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -119,6 +119,23 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkrailwayactfirst:view")
+    @GetMapping(value = "/likeByDesc/")
+    public RESTfulResult likeDesc(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterWorkRailwayActFirst> list = meterWorkRailwayActFirstService.likeByDesc(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -1015,7 +1032,6 @@ throw new MarkerMetException(500, "操作异常！！");
         RESTfulResult rm = failed();
         try {
             MeterWorkRailwayActFirst model = new MeterWorkRailwayActFirst();
-            //model.setPredictionNo(map.get("predictionNo").toString());
             model.setBaseSpotNo(map.get("baseSpotNo").toString());
             model.setBaseSpotName(map.get("baseSpotName").toString());
             model.setCreateManNo(map.get("createManNo").toString());
@@ -1023,13 +1039,20 @@ throw new MarkerMetException(500, "操作异常！！");
             /*SimpleDateFormat sdf = new SimpleDateFormat( "yyyy/MM/dd HH24:mm:ss" );
             Date date = sdf.parse(map.get("createTime").toString());*/
             model.setMeterWeight(new BigDecimal(map.get("meterWeight").toString()));
-
             model.setWeightType(map.get("weightType").toString());
             model.setRailwayNo(map.get("railwayNo").toString());
             model.setRailwayModelNo(map.get("railwayModelNo").toString());
             model.setRailwayModelName(map.get("railwayModelName").toString());
             model.setRailwayTypeNo(map.get("railwayTypeNo").toString());
             model.setRailwayTypeName(map.get("railwayTypeName").toString());
+//            model.setBaseSpotNo(splitString(map.get("baseSpotNo").toString(), 0));
+//            model.setBaseSpotName(splitString(map.get("baseSpotNo").toString(), 1));
+//            model.setCreateManNo(splitString(map.get("createManNo").toString(), 0));
+//            model.setCreateManName(splitString(map.get("createManNo").toString(), 1));
+//            model.setRailwayModelNo(splitString(map.get("railwayModelNo").toString(), 0));
+//            model.setRailwayModelName(splitString(map.get("railwayModelNo").toString(), 1));
+//            model.setRailwayTypeNo(splitString(map.get("railwayTypeNo").toString(), 0));
+//            model.setRailwayTypeName(splitString(map.get("railwayTypeNo").toString(), 1));
             rm = meterWorkRailwayActFirstService.supplementaryData(model);
         } catch (MarkerMetException e) {
             e.printStackTrace();
@@ -1043,6 +1066,12 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
+    //获取编号或者名称
+    public String splitString(String str, int i) {
+        String[] newString = str.split(",");
+        return newString[0];
+    }
+
     @ApiOperation(value = "动态衡维护界面--皮重保存", notes = "根据List<MeterWorkRailwayActFirst>对象进行批量修改重量类型")
     @PostMapping(value = "/doAddRailWf")
     public RESTfulResult doAddRailWf(@RequestBody List<MeterWorkRailwayActFirst> models) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -4414,7 +4414,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         List<PreRailwayScale> railwayScales = preRailwayScaleMapper.selectByRailwayNo(grossModel.getRailwayNo());
         if (railwayScales.size() >= 1) {
             if (railwayScales.size() == 1) {
-                ///////////无委托自动计量
+                ///////////无委托自动计量supplementaryData
 
                 PreRailwayScale scale = railwayScales.get(0);
                 MeterWorkRailwayActFirst actFirst01 = meterWorkRailwayActFirstMapper.selectAndMatch(grossModel.getActualFirstNo(), scale.getPredictionNo());

src/main/java/com/steerinfo/pretrack/prerailwayscale/controller/PreRailwayScaleController.java

@@ -71,7 +71,6 @@ throw new MarkerMetException(500, "操作异常！！");
 throw new MarkerMetException(500, "操作异常！！");
         }
     }
-
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -89,6 +88,24 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+
+    @ApiOperation(value = "获取倒序列表", notes = "分页模糊查询静态铁水衡和吊钩秤委托")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("prerailwayscale:view")
+    @GetMapping(value = "/likeByDesc/")
+    public RESTfulResult likeByDesc(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<PreRailwayScale> list = preRailwayScaleService.likeByDesc(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "创建", notes = "根据PreRailwayScale对象创建")
     @ApiImplicitParam(name = "preRailwayScale", value = "详细实体preRailwayScale", required = true, dataType = "PreRailwayScale")
     //@RequiresPermissions("prerailwayscale:create")

src/main/java/com/steerinfo/pretrack/prerailwayscale/mapper/PreRailwayScaleMapper.java

@@ -42,7 +42,7 @@ public interface PreRailwayScaleMapper extends IBaseMapper<PreRailwayScale, Stri
     List<PreRailwayScale> doQueryJLByCar(HashMap param);
 
     //作废超过两天的未使用的数据
-    void updateUnUseData();
+    //void updateUnUseData();
 
     //用于查询最近一个车号的预报或者正使用与使用中的预报，并显示毛重皮重净重及时间
     List<PreRailwayScale> doQueryJLByCarUsed(HashMap param);
@@ -52,4 +52,5 @@ public interface PreRailwayScaleMapper extends IBaseMapper<PreRailwayScale, Stri
     PreRailwayScale selectBypredictionNo(@Param( value = "predictionNo") String predictionNo);
 
     List<PreRailwayScale> selectByRailwayNo(@Param( value = "railwayNo") String railwayNo);
+    List<PreRailwayScale> likeByDesc(Map<String, Object> var1);
 }

src/main/java/com/steerinfo/pretrack/prerailwayscale/mapper/PreRailwayScaleMapper.xml

@@ -3070,6 +3070,7 @@
     <update id="updateMeterWorkRailwayReceiveds">
         update METER_WORK_RAILWAY_RECEIVED set value_flag='1' where ACTUAL_FIRST_NO=#{actualFirstNo}
     </update>
+    <update id="updateUnUseData"></update>
 
     <select id="selectBypredictionNo" parameterType="java.lang.String" resultMap="BaseResultMap">
         <include refid="select"/>
@@ -3085,4 +3086,16 @@
         and value_flag = '1'
       </where>
     </select>
+
+    <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+      <include refid="select"/>
+      <include refid="whereLike"/>
+      and matter_no in
+      <foreach collection="list" item="id" open="(" close=")" separator=",">
+        #{id}
+      </foreach>
+      and value_flag in ('0', '1')
+      and TRUST_AVAILABILITY_TIME >= sysDate
+      order by TRUST_DATE_TIME desc
+    </select>
   </mapper>

src/main/java/com/steerinfo/pretrack/prerailwayscale/service/IPreRailwayScaleService.java

@@ -6,6 +6,7 @@ import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * PreRailwayScale服务接口：
@@ -44,4 +45,6 @@ public interface IPreRailwayScaleService extends IBaseService<PreRailwayScale, S
     void InsertRailScale();
 
     List<PreRailwayScale> doQueryJLByCar(HashMap param);
+
+    PageList<PreRailwayScale> likeByDesc(HashMap param, Integer pageNum, Integer pageSize);
 }

src/main/java/com/steerinfo/pretrack/prerailwayscale/service/impl/PreRailwayScaleServiceImpl.java

@@ -1,5 +1,7 @@
 package com.steerinfo.pretrack.prerailwayscale.service.impl;
 
+import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
+import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -39,9 +41,11 @@ import java.util.*;
 @Service(value = "preRailwayScaleService")
 public class PreRailwayScaleServiceImpl extends BaseServiceImpl<PreRailwayScale, String> implements IPreRailwayScaleService {
 
-    @Autowired
+    @Resource
     private PreRailwayScaleMapper preRailwayScaleMapper;
 
+    @Resource
+    private ComBaseInfoMapper comBaseInfoMapper;
 
     @Override
     protected IBaseMapper<PreRailwayScale, String> getMapper() {
@@ -300,6 +304,18 @@ public class PreRailwayScaleServiceImpl extends BaseServiceImpl<PreRailwayScale,
         return list;
     }
 
+    @Override
+    public PageList<PreRailwayScale> likeByDesc(HashMap param, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        HashMap<String, Object> obj = new HashMap<>();
+        obj.put("pBaseCode", "001036");
+        List<String> matterList = comBaseInfoMapper.matterNoByBaseCode(obj);
+        param.put("list", matterList);
+        List<PreRailwayScale> rows = preRailwayScaleMapper.likeByDesc(param);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     @Autowired
     DataSource dataSource;