后端修改

src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java

@@ -864,14 +864,18 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     car.setCarNo(params.get("carNo").toString());
                     car.setCarTypeNo(params.get("carTypeNo").toString());
                     car.setCarTypeName(params.get("carTypeName").toString());
-//                        car.setMnemonicCode(params.get("mnemonicCode").toString());
-//                        car.setCustomerSupplierName(params.get("customerSupplierName").toString());
-//                        car.setMemo(params.get("memo").toString());
                     car.setCreateManNo(userId);
                     car.setCreateManName(userName);
                     car.setCreateTime(new Date());
                     // 将sso id写入车辆表，便于以后删除和重置密码
-                    car.setSsoId(ssoMap.get("data").toString());
+                    if(ssoMap.get("code").equals("1")) {
+                        HashMap<String, Object> carTemp = new HashMap<>();
+                        carTemp.put("userCode", params.get("carNo").toString());
+                        String ssoId = meterBaseCarMapper.ssoIdBySysUser(carTemp);
+                        car.setSsoId(ssoId);
+                    }else if(ssoMap.get("code").equals("0")) {
+                        car.setSsoId(ssoMap.get("data").toString());
+                    }
                     msg = meterBaseCarService.checkandadd(car);
                 }
             } else {

src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.java

@@ -29,4 +29,6 @@ public interface MeterBaseCarMapper extends IBaseMapper<MeterBaseCar, String> {
     List<MeterBaseCar> selectByParametersNoPage(Map<String, Object> parmas);
 
     int reNewID(MeterBaseCar map);
+
+    String ssoIdBySysUser(Map<String, Object> parmas);
 }

src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.xml

@@ -1070,4 +1070,9 @@
     </set>
     where CAR_NO = #{carNo,jdbcType=VARCHAR}
   </update>
+
+  <select id="ssoIdBySysUser" parameterType="java.util.HashMap" resultType="java.lang.String">
+     select user_Id as pk_no from sso.sys_user
+     where user_code = #{userCode}
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasecar/service/impl/MeterBaseCarServiceImpl.java

@@ -14,10 +14,7 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
-import com.steerinfo.util.CommonPage;
-import com.steerinfo.util.FieldsCollector;
-import com.steerinfo.util.SSOUtil;
-import com.steerinfo.util.StringUtils;
+import com.steerinfo.util.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -73,10 +70,13 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
 //        if(!com.isEmpty()){
 //            return "该车号已存在！";
 //        }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-        String afl = sdf.format(new Date());
-        String no = meterBaseCarMapper.GetNewID(afl);
-        model.setPkNo(afl + no);
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+//        String afl = sdf.format(new Date());
+//        String no = meterBaseCarMapper.GetNewID(afl);
+//        model.setPkNo(afl + no);
+
+        String no =  PublicMethod.IdCreate(3);
+        model.setPkNo(no);
         meterBaseCarMapper.insert(model);
         return "";
     }
@@ -297,8 +297,12 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
                             car.setPkNo(carModels.get(0).getPkNo());
                             meterBaseCarMapper.updateByPrimaryKeySelective(car);
                         }else {
-                            String no=meterBaseCarMapper.GetNewID(new SimpleDateFormat("yyyyMMdd").format(new Date()));
-                            car.setId(new SimpleDateFormat("yyyyMMdd").format(new Date())+no);
+//                            String no=meterBaseCarMapper.GetNewID(new SimpleDateFormat("yyyyMMdd").format(new Date()));
+//                            car.setId(new SimpleDateFormat("yyyyMMdd").format(new Date())+no);
+
+                            String no =  PublicMethod.IdCreate(3);
+                            car.setId(no);
+                            car.setPkNo(no);
                             meterBaseCarMapper.insertSelective(car);
                         }
                 }

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/controller/MeterWorkScheduledHelpController.java

@@ -76,6 +76,19 @@ public class MeterWorkScheduledHelpController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiOperation(value="计量大厅-获取异常报警信息列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkscheduledhelp:view")
+    @GetMapping(value = "/HelpMsgByDesc")
+    public RESTfulResult HelpMsgByDesc(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkScheduledHelp> list = meterWorkScheduledHelpService.HelpMsgByDesc(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+
     @ApiOperation(value="创建", notes="根据MeterWorkScheduledHelp对象创建")
     @ApiImplicitParam(name = "meterWorkScheduledHelp", value = "详细实体meterWorkScheduledHelp", required = true, dataType = "MeterWorkScheduledHelp")
     //@RequiresPermissions("meterworkscheduledhelp:create")

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/mapper/MeterWorkScheduledHelpMapper.java

@@ -13,4 +13,5 @@ public interface MeterWorkScheduledHelpMapper extends IBaseMapper<MeterWorkSched
     String getNewID(@Param(value = "afl") String afl);
 
     List<MeterWorkScheduledHelp> likeByDesc(Map<String, Object> var1);
+    List<MeterWorkScheduledHelp> HelpMsgByDesc(Map<String, Object> var1);
 }

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/mapper/MeterWorkScheduledHelpMapper.xml

@@ -461,4 +461,60 @@
     <include refid="whereLike"/>
     order by create_time desc
   </select>
+
+  <select id="HelpMsgByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <where>
+      <if test="helpId != null and helpId != ''">
+        and HELP_ID LIKE '%${helpId}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="helpContent != null and helpContent != ''">
+        and HELP_CONTENT LIKE '%${helpContent}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="endTime != null">
+        and TO_CHAR(END_TIME,'yyyy-MM-dd') = #{endTime}
+      </if>
+      <if test="createNo != null and createNo != ''">
+        and CREATE_NO LIKE '%${createNo}%'
+      </if>
+      <if test="createName != null and createName != ''">
+        and CREATE_NAME LIKE '%${createName}%'
+      </if>
+      <if test="result != null and result != ''">
+        and RESULT LIKE '%${result}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </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="measureTaskNum != null and measureTaskNum != ''">
+        and MEASURE_TASK_NUM LIKE '%${measureTaskNum}%'
+      </if>
+      <if test="warmType != null and warmType != ''">
+        and WARM_TYPE LIKE '%${warmType}%'
+      </if>
+      <if test="warmTypeName != null and warmTypeName != ''">
+        and WARM_TYPE_NAME LIKE '%${warmTypeName}%'
+      </if>
+      <if test="startTime01 != null and startTime01 != ''">
+        and create_time >= to_date(#{startTime01}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="endTime01 != null and endTime01 != ''">
+        and create_time &lt;= to_date(#{endTime01}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      and warm_type in ('1', '2', '3')
+    </where>
+    order by create_time desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/service/IMeterWorkScheduledHelpService.java

@@ -25,4 +25,5 @@ public interface IMeterWorkScheduledHelpService extends IBaseService<MeterWorkSc
     RESTfulResult scheduledHelpConfirm(String id, String createNo, String createName, String result);
     RESTfulResult checkAdd(MeterWorkScheduledHelp model);
     PageList<MeterWorkScheduledHelp> likeByDesc(Map<String, Object> var1, Integer var2, Integer var3);
+    PageList<MeterWorkScheduledHelp> HelpMsgByDesc(Map<String, Object> var1, Integer var2, Integer var3);
 }

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/service/impl/MeterWorkScheduledHelpServiceImpl.java

@@ -59,8 +59,10 @@ public class MeterWorkScheduledHelpServiceImpl extends BaseServiceImpl<MeterWork
         List<MeterWorkScheduledHelp> model = meterWorkScheduledHelpMapper.selectByParameters(map);
         //若是远程求助信息里面没有求助信息，重新生成Id直接插入
         if(model.size() >= 1){
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-            helpModel.setHelpId(sdf.format(new Date()));
+//            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+//            helpModel.setHelpId(sdf.format(new Date()));
+            String no =  PublicMethod.IdCreate(3);
+            helpModel.setHelpId(no);
             helpModel.setCarNo(carNo);
             helpModel.setBaseSpotNo(baseSpotNo);
             helpModel.setBaseSpotName(baseSpotName);
@@ -158,4 +160,12 @@ public class MeterWorkScheduledHelpServiceImpl extends BaseServiceImpl<MeterWork
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
+
+    @Override
+    public PageList<MeterWorkScheduledHelp> HelpMsgByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkScheduledHelp> rows = meterWorkScheduledHelpMapper.HelpMsgByDesc(parameters);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
 }