线路台账管理

business-service/src/main/java/com/ozs/entity/BaseCameraManagement.java

@@ -126,9 +126,9 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @Excel(name = "所属工务段名称")
     private String deptName;
 
-    /**
-     *是否显示启用录像按钮(1显示2不显示)
-     */
-    @TableField(exist = false)
-    private Integer isStartRecording;
+//    /**
+//     *是否显示启用录像按钮(1显示2不显示)
+//     */
+//    @TableField(exist = false)
+//    private Integer isStartRecording;
 }

business-service/src/main/resources/mapper/BaseCameraManagementMapper.xml

@@ -4,80 +4,27 @@
 
 
     <select id="selectCameraManagementList" resultType="com.ozs.entity.BaseCameraManagement" parameterType="com.ozs.entity.vo.BaseCameraManagementVo">
-        SELECT
-        a.id  AS id,
-        a.camera_code AS cameraCode,
-        a.railway_code AS railwayCode,
-        a.channel AS channel,
-        a.dept_id AS deptId,
-        a.line_dir AS lineDir,
-        a.install_mile AS installMile,
-        a.begin_mile AS beginMile,
-        a.end_mile AS endMile,
-        a.install_longitude AS installLongitude,
-        a.install_latitude AS installLatitude,
-        a.card_num AS cardNum,
-        a.start_recording AS startRecording,
-        a.task_id AS taskId,
-        a.create_time AS createTime
-        FROM
-        base_camera_management a
+        SELECT * FROM base_camera_management
         <where>
             <if test="railwayCode != null and railwayCode != ''">
-                and a.railway_code=#{railwayCode}
+                and railway_code = #{railwayCode}
             </if>
             <if test="lineDir != null and lineDir != 0">
-                and a.line_dir =#{lineDir}
+                and line_dir = #{lineDir}
             </if>
             <if test="deptId != null and deptId != 0">
-                and a.dept_id =#{deptId}
+                and dept_id = #{deptId}
             </if>
             <if test="beginMile != null and beginMile != 0">
-                and a.begin_mile &gt;=#{beginMile}
+                and begin_mile &gt;= #{beginMile}
             </if>
             <if test="endMile != null and endMile != 0">
-                and a.end_mile &lt;=#{endMile}
-            </if>
-            <if test="!dsFlay">
-                and
-                <trim prefix="(" prefixOverrides="or" suffix=")">
-                <if test="dsUserId != null and dsUserId != ''">
-                    or a.create_by=#{dsUserId}  
-                </if>
-                <if test="dsDeptId != null and dsDeptId != 0">
-                    or  a.dept_id=#{dsDeptId}  
-                </if>
-                <if test="dsDeptIds != null">
-                    or a.dept_id in
-                    <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
-                        #{item}
-                    </foreach>
-                </if>
-                </trim>
+                and end_mile &lt;= #{endMile}
             </if>
         </where>
     </select>
 
     <select id="countCamera" parameterType="com.ozs.entity.vo.MsgAlarmVo" resultType="java.lang.Integer">
         select count(id) from base_camera_management
-        <where>
-            <if test="!dsFlay">
-                and
-                <trim prefix="(" prefixOverrides="or" suffix=")">
-                    <if test="dsUserId != null and dsUserId != ''">
-                        or create_by = #{dsUserId}
-                    </if>
-                    <if test="dsDeptId != null and dsDeptId != 0">
-                        or dept_id = #{dsDeptId}
-                    </if>
-                    <if test="dsDeptIds != null">
-                        or dept_id in
-                        <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
-                            #{item}
-                        </foreach>
-                    </if>
-                </trim>
-            </if>
-        </where>
     </select>
 </mapper>

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -54,7 +54,8 @@ import java.util.stream.Collectors;
 @RequestMapping("/service/baseCameraManagement")
 @Slf4j
 public class BaseCameraManagementController extends BaseController {
-    public static final String PATTERN = "^[0-9]*$";
+//    public static final String PATTERN = "^[0-9]*$";
+    public static final String PATTERN = "^(\\d+.\\d{1,3}|\\d+)$";
     @Resource
     BaseCameraManagementService baseCameraManagementService;
     @Resource
@@ -156,18 +157,10 @@ public class BaseCameraManagementController extends BaseController {
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
         baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMile())) {
-            if (!baseCameraManagementVo.getBeginMile().toString().matches(PATTERN)) {
-                return error("监控范围开始里程位置填写格式不正确");
-            } else {
-                baseCameraManagementVo.setBeginMile(baseCameraManagementVo.getBeginMile() * 1000);
-            }
+            baseCameraManagementVo.setBeginMile(baseCameraManagementVo.getBeginMile() * 1000);
         }
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getEndMile())) {
-            if (!baseCameraManagementVo.getEndMile().toString().matches(PATTERN)) {
-                return error("监控范围结束里程位置填写格式不正确");
-            } else {
-                baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMile() * 1000);
-            }
+            baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMile() * 1000);
         }
         IPage<BaseCameraManagement> page = baseCameraManagementService.queryPage(baseCameraManagementVo);
         page.setTotal(page.getTotal());
@@ -182,8 +175,8 @@ public class BaseCameraManagementController extends BaseController {
                     queryWrapper.eq(BaseRailwayManagement::getRailwayCode, o.getRailwayCode());
                 }
                 BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-                SysDept sysDept = deptService.selectDeptById(o.getDeptId());
-                o.setDeptName(sysDept.getDeptName());
+//                SysDept sysDept = deptService.selectDeptById(o.getDeptId());
+//                o.setDeptName(sysDept.getDeptName());
                 o.setRailwayName(baseRailwayManagement.getRailwayName());
                 String mils = AppendUtils.stringAppend(o.getInstallMile());
                 o.setInstallMiles(mils);
@@ -191,17 +184,17 @@ public class BaseCameraManagementController extends BaseController {
                 o.setEndMiles(end);
                 String begin = AppendUtils.stringAppend(o.getBeginMile());
                 o.setBeginMiles(begin);
-                if (roleKey.size() > 0 || "admin".equals(baseUser.getUserName())) {
-                    o.setIsStartRecording(1);
-                    for (String s : roleKey) {
-                        if ("admin".equals(s) || "admin".equals(baseUser.getUserName())) {
-                            o.setIsStartRecording(1);
-                            break;
-                        } else {
-                            o.setIsStartRecording(2);
-                        }
-                    }
-                }
+//                if (roleKey.size() > 0 || "admin".equals(baseUser.getUserName())) {
+//                    o.setIsStartRecording(1);
+//                    for (String s : roleKey) {
+//                        if ("admin".equals(s) || "admin".equals(baseUser.getUserName())) {
+//                            o.setIsStartRecording(1);
+//                            break;
+//                        } else {
+//                            o.setIsStartRecording(2);
+//                        }
+//                    }
+//                }
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);
@@ -266,21 +259,24 @@ public class BaseCameraManagementController extends BaseController {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("设备动态管理表该相机编码已存在,不能重复添加");
         }
-        if (!baseCameraManagement.getBeginMile().toString().matches(PATTERN)) {
-            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
+        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
             return error("监控范围开始里程位置填写格式不正确");
+        } else {
+            double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
+            baseCameraManagement.setBeginMile((int) (begin * 1000));
         }
-        if (!baseCameraManagement.getInstallMile().toString().matches(PATTERN)) {
-            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
+        if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
             return error("监控相机安装里程位置填写格式不正确");
+        } else {
+            double install = Double.parseDouble(baseCameraManagement.getInstallMiles());
+            baseCameraManagement.setInstallMile((int) (install * 1000));
         }
-        if (!baseCameraManagement.getEndMile().toString().matches(PATTERN)) {
-            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
+        if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
             return error("监控范围结束里程位置填写格式不正确");
+        } else {
+            double end = Double.parseDouble(baseCameraManagement.getEndMiles());
+            baseCameraManagement.setEndMile((int) (end * 1000));
         }
-        baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile() * 1000);
-        baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile() * 1000);
-        baseCameraManagement.setEndMile(baseCameraManagement.getEndMile() * 1000);
         if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
             return error("监控范围开始里程位置不能大于监控范围结束里程位置");
         }

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseRailwayManagementController.java

@@ -207,6 +207,9 @@ public class BaseRailwayManagementController extends BaseController {
     @Log(title = "线路台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) {
         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getById(id);
+        if (StringUtils.isEmpty(baseRailwayManagement)) {
+            return AjaxResult.error("id不存在！");
+        }
         List<SysDictData> data = dictTypeService.selectDictDataByType("railway_type");
         for (SysDictData datum : data) {
             if (datum.getDictValue().equals(baseRailwayManagement.getRailwayType().toString())) {