添加修改

src/main/java/com/steerinfo/baseinfo/trucktarecheckwide/controller/TruckTareCheckWideController.java

@@ -1,11 +1,14 @@
 package com.steerinfo.baseinfo.trucktarecheckwide.controller;
 
+import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
+import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
 import com.steerinfo.baseinfo.trucktarecheckwide.model.TruckTareCheckWide;
 import com.steerinfo.baseinfo.trucktarecheckwide.service.ITruckTareCheckWideService;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.meterwork.meterworkdatacount.model.TruckHisTareComparison;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -36,6 +39,9 @@ public class TruckTareCheckWideController extends BaseRESTfulController {
     @Autowired
     ITruckTareCheckWideService truckTareCheckWideService;
 
+    @Autowired
+    ComBaseInfoMapper comBaseInfoMapper;
+
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -56,7 +62,21 @@ public class TruckTareCheckWideController extends BaseRESTfulController {
     //@RequiresPermissions("trucktarecheckwide:view")
     @GetMapping(value = "/like/")
     public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        ComBaseInfo comBaseInfo = comBaseInfoMapper.selectByPrimaryKey("001067001");
+        Double base = 0.0;
+        try {
+            base = Double.parseDouble(comBaseInfo.getBaseName());
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        if(parmas.get("baseSpotName") != null && !"".equals(parmas.get("baseSpotName"))){
+            parmas.put("baseSpotNameStr",parmas.get("baseSpotName").toString().split(","));
+        }
         PageList<TruckTareCheckWide> list = truckTareCheckWideService.queryLikeForPage(parmas, pageNum, pageSize);
+        List<TruckTareCheckWide> rows = list.getList();
+        for (TruckTareCheckWide row : rows) {
+            row.setBase(base);
+        }
         return success(list);
     }
     

src/main/java/com/steerinfo/baseinfo/trucktarecheckwide/mapper/TruckTareCheckWideMapper.xml

@@ -65,9 +65,6 @@
       <if test="id != null">
         and ID = #{id}
       </if>
-      <if test="baseSpotName != null and baseSpotName != ''">
-        and BASE_SPOT_NAME = #{baseSpotName}
-      </if>
       <if test="carNo != null and carNo != ''">
         and CAR_NO = #{carNo}
       </if>
@@ -164,6 +161,12 @@
       <if test="isValid != null">
         and IS_VALID = #{isValid}
       </if>
+      <if test="baseSpotNameStr != null and baseSpotNameStr.length > 0">
+        and BASE_SPOT_NAME in
+        <foreach collection="baseSpotNameStr" close=")" open="(" index="index" item="item">
+          #{item}
+        </foreach>
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -171,9 +174,6 @@
       <if test="id != null">
         and ID = #{id}
       </if>
-      <if test="baseSpotName != null and baseSpotName != ''">
-        and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
-      </if>
       <if test="carNo != null and carNo != ''">
         and CAR_NO LIKE '%${carNo}%'
       </if>
@@ -270,6 +270,12 @@
       <if test="isValid != null">
         and IS_VALID = #{isValid}
       </if>
+      <if test="baseSpotNameStr != null and baseSpotNameStr.length > 0">
+        and BASE_SPOT_NAME in
+        <foreach collection="baseSpotNameStr" close=")" open="(" index="index" item="item" separator=",">
+          #{item}
+        </foreach>
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">

src/main/java/com/steerinfo/baseinfo/trucktarecheckwide/model/TruckTareCheckWide.java

@@ -9,6 +9,8 @@ import java.util.Date;
 
 @ApiModel(value="null")
 public class TruckTareCheckWide implements IBasePO<Short> {
+    private double base;
+
     @ApiModelProperty(value="",required=true)
     private Short id;
 
@@ -429,4 +431,12 @@ public class TruckTareCheckWide implements IBasePO<Short> {
         sb.append("]");
         return sb.toString();
     }
+
+    public double getBase() {
+        return base;
+    }
+
+    public void setBase(double base) {
+        this.base = base;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.xml

@@ -453,7 +453,7 @@
         -- 报警类型
         CASE
         WHEN C.clean_up_weight IS NOT NULL
-        AND ABS(ROUND((A.meter_weight - C.clean_up_weight) / 1000, 2)) > T.TOLERANCE
+        AND ABS(ROUND((A.meter_weight - C.clean_up_weight) / 1000, 2)) > THRESHOLD.TOLERANCE
         THEN '皮重超过偏差'
         WHEN C.clean_up_weight IS NOT NULL THEN '正常皮重'
         ELSE NULL
@@ -496,6 +496,7 @@
         C.clean_up_weight AS cleanUpWeight,
         C.clean_up_time AS upTime
         FROM meter_work_car_actual_first A
+        CROSS JOIN THRESHOLD   -- 添加此行
         OUTER APPLY (
         SELECT tare_weight AS clean_up_weight,
         c.TARE_TIME AS clean_up_time
@@ -518,11 +519,11 @@
         <if test="alarmType != null and alarmType != ''">
             <if test="alarmType == 0">
                 and C.clean_up_weight is not null
-                AND ABS(ROUND((A.meter_weight - C.clean_up_weight) / 1000, 2)) > T.TOLERANCE
+                AND ABS(ROUND((A.meter_weight - C.clean_up_weight) / 1000, 2)) > THRESHOLD.TOLERANCE
             </if>
             <if test="alarmType == 1">
                 AND C.clean_up_weight IS NOT NULL
-                AND ABS(ROUND((A.meter_weight - C.clean_up_weight) / 1000, 2)) &lt;= T.TOLERANCE
+                AND ABS(ROUND((A.meter_weight - C.clean_up_weight) / 1000, 2)) &lt;= THRESHOLD.TOLERANCE
             </if>
         </if>
         <!-- 车号模糊查询 -->

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -3778,6 +3778,12 @@
           #{item}
         </foreach>
       </if>
+      <if test="baseSpotNoList != null and baseSpotNoList.size() > 0">
+        and base_spot_no in
+        <foreach collection="baseSpotNoList" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="lcNoTemp != null and lcNoTemp != ''">
         and ( lc_no in
         <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml

@@ -4569,6 +4569,12 @@
           #{item}
         </foreach>
       </if>
+      <if test="baseSpotNoList != null and baseSpotNoList.size() > 0">
+        and net_spot3_no in
+        <foreach collection="baseSpotNoList" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="predictionType != null and predictionType != ''">
         and PREDICTION_TYPE LIKE '%${predictionType}%'
       </if>
@@ -4703,6 +4709,12 @@
     <if test="senderRemark != null and senderRemark != ''">
       and sender_remark LIKE '%${senderRemark}%'
     </if>
+    <if test="baseSpotNoList != null and baseSpotNoList.length  > 0">
+      and net_spot3_no in
+      <foreach collection="baseSpotNoList" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
     order by net_time desc
   </select>
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -3141,6 +3141,13 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         HashMap<String, Object> map = new HashMap();
         map.put("userId", userId);
         map.put("userName", userName);
+        if(parameters != null && parameters.containsKey("baseSpotNoList")) {
+            if(parameters.get("baseSpotNoList") != null && !"".equals(parameters.get("baseSpotNoList"))) {
+                parameters.put("baseSpotNoList", parameters.get("baseSpotNoList").toString().split(","));
+            }else{
+                parameters.remove("baseSpotNoList");
+            }
+        }
         List<MeterBaseUserPrintConfig> configs = meterBaseUserPrintConfigMapper.likeByDesc(map);
         List<MeterWorkRailwayActual> rowsTemp = meterWorkRailwayActualMapper.railwayPrintLikeByDesc(parameters);
         List<MeterWorkRailwayActual> rows = new ArrayList<>();

src/main/java/com/steerinfo/util/SSOUtil.java

@@ -3,11 +3,9 @@ package com.steerinfo.util;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -19,37 +17,12 @@ import java.util.Map;
 @Component
 public class SSOUtil {
 
-
-    // ② 改为静态字段，用于保存配置值（所有实例共享）
-    private static String url;
-    private static String appuser;
-    private static String password;
-
-    // ③ 通过 setter 注入，赋值给静态变量（注意方法不能是 static）
-    @Value("${sso.url}")
-    public void setUrl(String url) {
-        SSOUtil.url = url;
-    }
-
-    @Value("${sso.appuser}")
-    public void setAppuser(String appuser) {
-        SSOUtil.appuser = appuser;
-    }
-
-    @Value("${sso.password}")
-    public void setPassword(String password) {
-        SSOUtil.password = password;
-    }
-
-    // ④ 提供静态 getter（可选，用于外部读取）
-    public static String getUrl() { return url; }
-    public static String getAppuser() { return appuser; }
-    public static String getPassword() { return password; }
-
     // sso注册用户
     public HashMap ssoRegister(HashMap params) throws Exception {
         HashMap<String, String> map = new HashMap<>();
 
+        String ssoUrl = Configuration.readConfigString("sso.url", "application");
+
         // *将司机注册sso账户*
         // 使用默认账号登录sso
         String accessToken = ssoDefaultLogin();
@@ -69,7 +42,7 @@ public class SSOUtil {
             userMap.put("companyId", "713710108567277568");
             userMap.put("orgId", "925357747573231616");
             userMap.put("loginStatus", "1");
-            String ssomsg2 = HttpsRequest.sendPost(url + "/v1/sysusers/", userMap, accessToken);
+            String ssomsg2 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/", userMap, accessToken);
 
             JSONObject jsonObject2 = JSONObject.parseObject(ssomsg2);
 
@@ -85,7 +58,7 @@ public class SSOUtil {
                 pwdMap.put("againNewpassword", params.get("password").toString());
 
                 // 修改用户密码
-                String ssomsg3 = HttpsRequest.sendPost(url + "/v1/sysusers/updpsw", pwdMap, accessToken);
+                String ssomsg3 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/updpsw", pwdMap, accessToken);
 
                 JSONObject jsonObject3 = JSONObject.parseObject(ssomsg3);
 
@@ -122,6 +95,7 @@ public class SSOUtil {
      */
     public String ssoUpdate(String id, HashMap params, String accessToken) throws Exception {
         String msg = "";
+        String ssoUrl = Configuration.readConfigString("sso.url", "application");
 
         // 不传token时，自行获取默认账户的token
         if(StringUtils.isEmpty(accessToken)){
@@ -129,7 +103,7 @@ public class SSOUtil {
         }
 
         // 修改用户密码
-        String ssomsg3 = HttpsRequest.sendPost(url + "/v1/sysusers/updateUser/"+id, params, accessToken);
+        String ssomsg3 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/updateUser/"+id, params, accessToken);
 
         JSONObject jsonObject = JSONObject.parseObject(ssomsg3);
 
@@ -147,14 +121,14 @@ public class SSOUtil {
      * @return
      */
     public String ssoDeleter(String id, String accessToken) throws Exception {
-
+        String ssoUrl = Configuration.readConfigString("sso.url", "application");
 
         // 不传token时，自行获取默认账户的token
         if(StringUtils.isEmpty(accessToken)){
             accessToken = ssoDefaultLogin();
         }
 
-        String ssomsg4 = HttpsRequest.sendDelete(url + "/v1/sysusers/"+id, accessToken);
+        String ssomsg4 = HttpsRequest.sendDelete(ssoUrl + "/v1/sysusers/"+id, accessToken);
 
         JSONObject jsonObject = JSONObject.parseObject(ssomsg4);
 
@@ -166,18 +140,21 @@ public class SSOUtil {
      * @return
      */
     public String ssoDefaultLogin() throws Exception {
+        String ssoUrl = Configuration.readConfigString("sso.url", "application");
+        String ssoPassword = Configuration.readConfigString("sso.password", "application");
+        String ssoAppUser = Configuration.readConfigString("sso.appuser", "application");
         // 使用默认账号登录sso
         // 默认账户密码加密
-        String shaPass = SHAUtil.shaEncode(password);
+        String shaPass = SHAUtil.shaEncode(ssoPassword);
         // 获取sso token
         // https://jgwzjl.jiugang.com/icore.icp.web/pass/auth/login   post请求， 参数类型content-type: application/x-www-form-urlencoded
         // loginName=admin&password=fb94871a1c3c7c38330a3a434a0ee28f0deea30b&app_code=web
         Map<String, String> loginMap = new HashMap<>();
-        loginMap.put("loginName", appuser);
+        loginMap.put("loginName", ssoAppUser);
         loginMap.put("password", shaPass);
 
 
-        String ssomsg1 = HttpsRequest.sendPost(url + "/auth/login", loginMap);
+        String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
         // ssomsg1转JSONObject
         JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
         //如果成功，读取accessToken
@@ -197,6 +174,7 @@ public class SSOUtil {
      * @return
      */
     public HashMap ssoLogin(HashMap params, String accessToken) throws Exception {
+        String ssoUrl = Configuration.readConfigString("sso.url", "application");
 
         HashMap<String, String> map = new HashMap<>();
 
@@ -213,7 +191,7 @@ public class SSOUtil {
         loginMap.put("loginName", params.get("carNo").toString());
         loginMap.put("password", shaPass);
 
-        String ssomsg1 = HttpsRequest.sendPost(url + "/auth/login", loginMap);
+        String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
         // ssomsg1转JSONObject
         JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
 
@@ -236,6 +214,7 @@ public class SSOUtil {
      * @return
      */
     public HashMap ssoChangePwd(HashMap params) throws Exception {
+        String ssoUrl = Configuration.readConfigString("sso.url", "application");
 
         HashMap<String, String> map = new HashMap<>();
 
@@ -247,7 +226,7 @@ public class SSOUtil {
         loginMap.put("loginName", params.get("carNo").toString());
         loginMap.put("password", shaPass);
 
-        String ssomsg1 = HttpsRequest.sendPost(url + "/auth/login", loginMap);
+        String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
         // ssomsg1转JSONObject
         JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
         //如果成功，读取accessToken
@@ -267,7 +246,7 @@ public class SSOUtil {
             pwdMap.put("againNewpassword", params.get("newpassword").toString());
 
             // 修改用户密码
-            String ssomsg3 = HttpsRequest.sendPost(url + "/v1/sysusers/updpsw", pwdMap, accessToken);
+            String ssomsg3 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/updpsw", pwdMap, accessToken);
 
             JSONObject jsonObject3 = JSONObject.parseObject(ssomsg3);
 
@@ -294,6 +273,8 @@ public class SSOUtil {
      */
     public String ssoResetPwd(String id, String password, String accessToken) throws Exception {
         String msg = "";
+        String ssoUrl = Configuration.readConfigString("sso.url", "application");
+
         // 不传token时，自行获取默认账户的token
         if(StringUtils.isEmpty(accessToken)){
             accessToken = ssoDefaultLogin();
@@ -302,7 +283,7 @@ public class SSOUtil {
         Map<String, String> map = new HashMap<>();
         map.put("password", password);
 
-        String ssomsg4 = HttpsRequest.sendPut(url + "/v1/sysusers/resetPassword/"+id, map, accessToken);
+        String ssomsg4 = HttpsRequest.sendPut(ssoUrl + "/v1/sysusers/resetPassword/"+id, map, accessToken);
 
         JSONObject jsonObject2 = JSONObject.parseObject(ssomsg4);
 
@@ -328,11 +309,11 @@ public class SSOUtil {
 //     */
 //    public HashMap ssoSelect(String carNo) throws Exception {
 //
-//        String url = Configuration.readConfigString("sso.url", "application");
+//        String ssoUrl = Configuration.readConfigString("sso.url", "application");
 //
 //        String accessToken = ssoDefaultLogin();
 //
-//        String ssomsg = HttpsRequest.sendPut(url + "/v1/sysusers/getUsersByOrgCode/?userCode="+carNo+"&pageNum=1&pageSize=20", null, accessToken);
+//        String ssomsg = HttpsRequest.sendPut(ssoUrl + "/v1/sysusers/getUsersByOrgCode/?userCode="+carNo+"&pageNum=1&pageSize=20", null, accessToken);
 //
 //        JSONObject jsonObject = JSONObject.parseObject(ssomsg);
 //
@@ -342,4 +323,4 @@ public class SSOUtil {
 //
 //        return map;
 //    }
-}
+}