修改

pom.xml

@@ -121,7 +121,7 @@
                         <exclude>**/application.properties</exclude>
                         <exclude>**/application-prod.properties</exclude>
                         <exclude>**/application-dev.properties</exclude>
-                        <exclude>**/jg_wzjl_api-dev.properties</exclude>
+                        <exclude>**/jg_wzjl_api.properties</exclude>
                         <exclude>**/jg_wzjl_api-prod.properties</exclude>
                     </excludes>
                 </configuration>

src/main/java/com/steerinfo/metermonitor/metermonitornote/controller/MeterMonitorNoteController.java

@@ -4,6 +4,7 @@ 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.metermonitor.metermonitornote.dto.MeterMonitorNoteAll;
 import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.metermonitor.metermonitornote.service.IMeterMonitorNoteService;
 import com.steerinfo.meterwork.except.MarkerMetException;
@@ -57,6 +58,23 @@ public class MeterMonitorNoteController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "获取列表", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("metermonitornote:view")
+    @GetMapping(value = "/getOptions")
+    public RESTfulResult getOptions(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterMonitorNoteAll> list = meterMonitorNoteService.getOptions(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"),

src/main/java/com/steerinfo/metermonitor/metermonitornote/dto/MeterMonitorNoteAll.java

@@ -0,0 +1,131 @@
+package com.steerinfo.metermonitor.metermonitornote.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class MeterMonitorNoteAll {
+
+
+    /**
+     * 计量点编号(BASE_SPOT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点编号",required=false)
+    private String baseSpotNo;
+
+    /**
+     * 计量点名称(BASE_SPOT_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量点名称",required=false)
+    private String baseSpotName;
+
+    /**
+     * 操作内容|日志内容(OPERATION_CONTENT,VARCHAR,400)
+     */
+    @ApiModelProperty(value="操作内容|日志内容",required=true)
+    private String operationContent;
+
+    /**
+     * 操作时间|记录时间(YYYY-MM-DD HH:mm:SS)(OPERATION_TIME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="操作时间|记录时间(YYYY-MM-DD HH:mm:SS)",required=true)
+    private String operationTime;
+
+    /**
+     * 车号(CAR_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车号",required=false)
+    private String carNo;
+
+    /**
+     * 计量员编号(METER_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量员编号",required=false)
+    private String meterManNo;
+
+    /**
+     * 计量员姓名(METER_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量员姓名",required=false)
+    private String meterManName;
+
+    /**
+     * 日志来源(0智能计量终端,1自助取码终端,2计量监控终端 3微信小程序 4远程计量终端)(METER_NOTE_SOURCE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="日志来源(0智能计量终端,1自助取码终端,2计量监控终端 3微信小程序 4远程计量终端)",required=false)
+    private String meterNoteSource;
+
+    /**
+     * 计量日志类型编码(NOTE_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量日志类型编码",required=false)
+    private String noteTypeNo;
+
+    /**
+     * 计量日志类型名称(NOTE_TYPE_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量日志类型名称",required=false)
+    private String noteTypeName;
+
+    /**
+     * 预报编号(PREDICTION_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="预报编号",required=false)
+    private String predictionNo;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人姓名",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间（YYYY-MM-DD HH:mm:SS）(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date updateTime;
+
+    /**
+     * 监控界面提示信息(MONITOR_NOTE,VARCHAR,400)
+     */
+    @ApiModelProperty(value="监控界面提示信息",required=false)
+    private String monitorNote;
+
+    private String MatterName;
+
+    private String receiveUintName;
+
+    private String forwardUnitName;
+}

src/main/java/com/steerinfo/metermonitor/metermonitornote/mapper/MeterMonitorNoteMapper.java

@@ -1,6 +1,7 @@
 package com.steerinfo.metermonitor.metermonitornote.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.metermonitor.metermonitornote.dto.MeterMonitorNoteAll;
 import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 import com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp;
@@ -17,6 +18,8 @@ public interface MeterMonitorNoteMapper extends IBaseMapper<MeterMonitorNote, St
 
     List<MeterMonitorNote> likeByDesc(Map<String, Object> parmas);
 
+    List<MeterMonitorNoteAll> getOptions(Map<String, Object> parmas);
+
     List<MeterMonitorNote> selectByTime(Map<String, Object> parmas);
 
     String getNewID(@Param(value = "afl") String afl);

src/main/java/com/steerinfo/metermonitor/metermonitornote/mapper/MeterMonitorNoteMapper.xml

@@ -731,6 +731,84 @@
     order by operation_time desc
   </select>
 
+  select id="getOptions" parameterType="java.util.HashMap" resultMap="com.steerinfo.metermonitor.metermonitornote.dto.MeterMonitorNoteAll">
+    SELECT * FROM METER_MONITOR_NOTE
+    <where>
+      and operation_content like '勾选%'
+      <if test="noteNo != null and noteNo != ''">
+        and NOTE_NO LIKE '%${noteNo}%'
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
+      </if>
+      <if test="operationContent != null and operationContent != ''">
+        and OPERATION_CONTENT LIKE '%${operationContent}%'
+      </if>
+      <if test="operationTime != null and operationTime != ''">
+        and OPERATION_TIME LIKE '%${operationTime}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="meterManNo != null and meterManNo != ''">
+        and METER_MAN_NO LIKE '%${meterManNo}%'
+      </if>
+      <if test="meterManName != null and meterManName != ''">
+        and METER_MAN_NAME LIKE '%${meterManName}%'
+      </if>
+      <if test="meterNoteSource != null and meterNoteSource != ''">
+        and METER_NOTE_SOURCE LIKE '%${meterNoteSource}%'
+      </if>
+      <if test="noteTypeNo != null and noteTypeNo != ''">
+        and NOTE_TYPE_NO LIKE '%${noteTypeNo}%'
+      </if>
+      <if test="noteTypeName != null and noteTypeName != ''">
+        and NOTE_TYPE_NAME LIKE '%${noteTypeName}%'
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO LIKE '%${predictionNo}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="monitorNote != null and monitorNote != ''">
+        and MONITOR_NOTE LIKE '%${monitorNote}%'
+      </if>
+      <if test="baseSpotNoStr != null and baseSpotNoStr != ''">
+        and BASE_SPOT_NO in
+        <foreach collection="spotNoStr" index="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and to_date(OPERATION_TIME ,'yyyy-mm-dd HH24:mi:ss') >= to_date(#{startTime},'yyyy-mm-dd HH24:mi:ss')-3/24/60
+        and to_date(OPERATION_TIME ,'yyyy-mm-dd HH24:mi:ss') &lt;= to_date(#{endTime},'yyyy-mm-dd HH24:mi:ss') + 1/(24*60)
+      </if>
+    </where>
+    order by operation_time desc
+  </select>
+
   <!--根据时间查询所有秤点的不验证历史皮重、不验证异地计量、不验证零点告警、不验证时间间隔、不验证对射、不验证毛皮超差-->
   <select id="countAllState" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>

src/main/java/com/steerinfo/metermonitor/metermonitornote/service/IMeterMonitorNoteService.java

@@ -2,6 +2,7 @@ package com.steerinfo.metermonitor.metermonitornote.service;
 
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.metermonitor.metermonitornote.dto.MeterMonitorNoteAll;
 import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 
 import java.util.HashMap;
@@ -27,6 +28,8 @@ public interface IMeterMonitorNoteService extends IBaseService<MeterMonitorNote,
 
     PageList<MeterMonitorNote> likeByDesc(Map<String, Object> var1, Integer var2, Integer var3);
 
+    PageList<MeterMonitorNoteAll> getOptions(Map<String, Object> var1, Integer var2, Integer var3);
+
     PageList<MeterMonitorNote> selectByTime(String baseSpotNo, String operationTime,String carNo, Integer pageNum, Integer pageSize);
 
     String doSaveWf(MeterMonitorNote model);

src/main/java/com/steerinfo/metermonitor/metermonitornote/service/impl/MeterMonitorNoteServiceImpl.java

@@ -4,6 +4,7 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.metermonitor.metermonitornote.dto.MeterMonitorNoteAll;
 import com.steerinfo.metermonitor.metermonitornote.mapper.MeterMonitorNoteMapper;
 import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.metermonitor.metermonitornote.service.IMeterMonitorNoteService;
@@ -71,6 +72,22 @@ public class MeterMonitorNoteServiceImpl extends BaseServiceImpl<MeterMonitorNot
         return pageInfo;
     }
 
+    @Override
+    public PageList<MeterMonitorNoteAll> getOptions(Map<String, Object> parmas, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        if(parmas.get("baseSpotNoStr") != null) {
+            String spotNoStr[] = parmas.get("baseSpotNoStr").toString().split(",");
+            parmas.put("spotNoStr", spotNoStr);
+        }
+//        if(parmas.get("createManNoStr") != null) {
+//            String manNoStr[] = parmas.get("createManNoStr").toString().split(",");
+//            parmas.put("manNoStr", manNoStr);
+//        }
+        List<MeterMonitorNoteAll> rows = meterMonitorNoteMapper.getOptions(parmas);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     @Override
     @Transactional(rollbackFor=Exception.class)
     public PageList<MeterMonitorNote> selectByTime(String baseSpotNo, String operationTime, String carNo,Integer pageNum, Integer pageSize)

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

@@ -442,14 +442,18 @@
 
     <select id="truckHisTareComparison" parameterType="java.util.HashMap"
             resultType="com.steerinfo.meterwork.meterworkdatacount.model.TruckHisTareComparison">
+        WITH THRESHOLD AS (
+        SELECT TO_NUMBER(BASE_NAME) / 1000 AS TOLERANCE
+        FROM com_base_info
+        WHERE BASE_CODE = '001067001'
+        )
         SELECT
         A.base_spot_name AS baseSpotName,
         A.car_no AS carNo,
         -- 报警类型
         CASE
         WHEN C.clean_up_weight IS NOT NULL
-        AND ABS(ROUND((A.meter_weight - C.clean_up_weight) / 1000, 2)) >
-        (SELECT TO_NUMBER(BASE_NAME) / 1000 FROM com_base_info WHERE BASE_CODE = '001067001')
+        AND ABS(ROUND((A.meter_weight - C.clean_up_weight) / 1000, 2)) > T.TOLERANCE
         THEN '皮重超过偏差'
         WHEN C.clean_up_weight IS NOT NULL THEN '正常皮重'
         ELSE NULL
@@ -489,50 +493,53 @@
         END AS meterTypeName,
         A.note,
         C.clean_up_weight AS effectiveUpWeight,
-        C.clean_up_weight AS cleanUpWeight
+        C.clean_up_weight AS cleanUpWeight,
+        C.clean_up_time AS upTime
         FROM meter_work_car_actual_first A
         OUTER APPLY (
-        SELECT tare_weight AS clean_up_weight
+        SELECT tare_weight AS clean_up_weight,
+        c.TARE_TIME AS clean_up_time
         FROM meter_work_car_actual C
         WHERE C.car_no = A.car_no
         AND C.create_time &lt; A.create_time
         AND C.VALUE_FLAG != 0
-        AND nvl(C.PREDICTION_TYPE,0) not in (6,7)        -- 非混装/混卸
+        AND (C.PREDICTION_TYPE IS NULL OR C.PREDICTION_TYPE NOT IN (6,7))  -- 改写，让索引可用
+        -- 非混装/混卸
         ORDER BY C.create_time DESC
         FETCH FIRST 1 ROW ONLY
         ) C
         WHERE A.weight_type = '1'
         <!-- 时间范围 -->
         <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-            AND create_time >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
-            AND create_time &lt;= TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+            AND A.create_time >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+            AND A.create_time &lt;= TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
         </if>
         <!-- 报警类型：0=超差，1=正常 -->
         <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)) > (SELECT TO_NUMBER(BASE_NAME) / 1000 FROM com_base_info WHERE BASE_CODE = '001067001')
+                AND ABS(ROUND((A.meter_weight - C.clean_up_weight) / 1000, 2)) > T.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;= (SELECT TO_NUMBER(BASE_NAME) / 1000 FROM com_base_info WHERE BASE_CODE = '001067001')
+                AND ABS(ROUND((A.meter_weight - C.clean_up_weight) / 1000, 2)) &lt;= T.TOLERANCE
             </if>
         </if>
         <!-- 车号模糊查询 -->
         <if test="carNo != null and carNo != ''">
-            AND car_no LIKE '%${carNo}%'
+            AND A.car_no LIKE '%${carNo}%'
         </if>
         <!-- 计量模式 -->
         <if test="meterMode != null and meterMode != ''">
-            AND meter_mode = #{meterMode}
+            AND A.meter_mode = #{meterMode}
         </if>
         <!-- 计量类型编号 -->
         <if test="meterTypeNo != null and meterTypeNo != ''">
-            AND meter_type_no = #{meterTypeNo}
+            AND A.meter_type_no = #{meterTypeNo}
         </if>
         <!-- 基地名称列表 -->
         <if test="baseSpotName != null and baseSpotName.size() != 0">
-            AND base_spot_name IN
+            AND A.base_spot_name IN
             <foreach collection="baseSpotName" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/impl/MeterWorkMonitorServiceImpl.java

@@ -86,6 +86,7 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
     @Override
     public String doUpdateWf(MeterWorkMonitor model) {
         try {
+            model.setLastTime(new Date());
             meterWorkMonitorMapper.updateByPrimaryKeySelective(model);
             return model.getPointNo();
         } catch (Exception ex) {

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

@@ -3,9 +3,11 @@ 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;
 
@@ -17,14 +19,32 @@ 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 String ssoUrl;
+    public void setUrl(String url) {
+        SSOUtil.url = url;
+    }
 
     @Value("${sso.appuser}")
-    private String ssoAppUser ;
+    public void setAppuser(String appuser) {
+        SSOUtil.appuser = appuser;
+    }
 
     @Value("${sso.password}")
-    private String ssoPassword ;
+    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 {
@@ -49,7 +69,7 @@ public class SSOUtil {
             userMap.put("companyId", "713710108567277568");
             userMap.put("orgId", "925357747573231616");
             userMap.put("loginStatus", "1");
-            String ssomsg2 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/", userMap, accessToken);
+            String ssomsg2 = HttpsRequest.sendPost(url + "/v1/sysusers/", userMap, accessToken);
 
             JSONObject jsonObject2 = JSONObject.parseObject(ssomsg2);
 
@@ -65,7 +85,7 @@ public class SSOUtil {
                 pwdMap.put("againNewpassword", params.get("password").toString());
 
                 // 修改用户密码
-                String ssomsg3 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/updpsw", pwdMap, accessToken);
+                String ssomsg3 = HttpsRequest.sendPost(url + "/v1/sysusers/updpsw", pwdMap, accessToken);
 
                 JSONObject jsonObject3 = JSONObject.parseObject(ssomsg3);
 
@@ -109,7 +129,7 @@ public class SSOUtil {
         }
 
         // 修改用户密码
-        String ssomsg3 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/updateUser/"+id, params, accessToken);
+        String ssomsg3 = HttpsRequest.sendPost(url + "/v1/sysusers/updateUser/"+id, params, accessToken);
 
         JSONObject jsonObject = JSONObject.parseObject(ssomsg3);
 
@@ -134,7 +154,7 @@ public class SSOUtil {
             accessToken = ssoDefaultLogin();
         }
 
-        String ssomsg4 = HttpsRequest.sendDelete(ssoUrl + "/v1/sysusers/"+id, accessToken);
+        String ssomsg4 = HttpsRequest.sendDelete(url + "/v1/sysusers/"+id, accessToken);
 
         JSONObject jsonObject = JSONObject.parseObject(ssomsg4);
 
@@ -148,16 +168,16 @@ public class SSOUtil {
     public String ssoDefaultLogin() throws Exception {
         // 使用默认账号登录sso
         // 默认账户密码加密
-        String shaPass = SHAUtil.shaEncode(ssoPassword);
+        String shaPass = SHAUtil.shaEncode(password);
         // 获取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", ssoAppUser);
+        loginMap.put("loginName", appuser);
         loginMap.put("password", shaPass);
 
 
-        String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
+        String ssomsg1 = HttpsRequest.sendPost(url + "/auth/login", loginMap);
         // ssomsg1转JSONObject
         JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
         //如果成功，读取accessToken
@@ -193,7 +213,7 @@ public class SSOUtil {
         loginMap.put("loginName", params.get("carNo").toString());
         loginMap.put("password", shaPass);
 
-        String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
+        String ssomsg1 = HttpsRequest.sendPost(url + "/auth/login", loginMap);
         // ssomsg1转JSONObject
         JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
 
@@ -227,7 +247,7 @@ public class SSOUtil {
         loginMap.put("loginName", params.get("carNo").toString());
         loginMap.put("password", shaPass);
 
-        String ssomsg1 = HttpsRequest.sendPost(ssoUrl + "/auth/login", loginMap);
+        String ssomsg1 = HttpsRequest.sendPost(url + "/auth/login", loginMap);
         // ssomsg1转JSONObject
         JSONObject jsonObject1 = JSONObject.parseObject(ssomsg1);
         //如果成功，读取accessToken
@@ -247,7 +267,7 @@ public class SSOUtil {
             pwdMap.put("againNewpassword", params.get("newpassword").toString());
 
             // 修改用户密码
-            String ssomsg3 = HttpsRequest.sendPost(ssoUrl + "/v1/sysusers/updpsw", pwdMap, accessToken);
+            String ssomsg3 = HttpsRequest.sendPost(url + "/v1/sysusers/updpsw", pwdMap, accessToken);
 
             JSONObject jsonObject3 = JSONObject.parseObject(ssomsg3);
 
@@ -282,7 +302,7 @@ public class SSOUtil {
         Map<String, String> map = new HashMap<>();
         map.put("password", password);
 
-        String ssomsg4 = HttpsRequest.sendPut(ssoUrl + "/v1/sysusers/resetPassword/"+id, map, accessToken);
+        String ssomsg4 = HttpsRequest.sendPut(url + "/v1/sysusers/resetPassword/"+id, map, accessToken);
 
         JSONObject jsonObject2 = JSONObject.parseObject(ssomsg4);
 
@@ -308,11 +328,11 @@ public class SSOUtil {
 //     */
 //    public HashMap ssoSelect(String carNo) throws Exception {
 //
-//        String ssoUrl = Configuration.readConfigString("sso.url", "application");
+//        String url = Configuration.readConfigString("sso.url", "application");
 //
 //        String accessToken = ssoDefaultLogin();
 //
-//        String ssomsg = HttpsRequest.sendPut(ssoUrl + "/v1/sysusers/getUsersByOrgCode/?userCode="+carNo+"&pageNum=1&pageSize=20", null, accessToken);
+//        String ssomsg = HttpsRequest.sendPut(url + "/v1/sysusers/getUsersByOrgCode/?userCode="+carNo+"&pageNum=1&pageSize=20", null, accessToken);
 //
 //        JSONObject jsonObject = JSONObject.parseObject(ssomsg);
 //