新增了“通知公告”接口，修改了“维修记录”、“车辆信息”、“司机信息”、“承运单位直接录入”、“轨道衡一次计量”、“汽车衡一次计量”、“轨道衡结净”接口

src/main/java/com/steerinfo/associate/maintenancerecord/controller/MaintenanceRecordController.java

@@ -65,6 +65,18 @@ public class MaintenanceRecordController extends BaseRESTfulController {
         PageList<MaintenanceRecord> list = maintenanceRecordService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("maintenancerecord:view")
+    @PostMapping(value = "/like/")
+    public RESTfulResult listpost(@RequestBody HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MaintenanceRecord> list = maintenanceRecordService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
     
     @ApiOperation(value="创建", notes="根据MaintenanceRecord对象创建")
     @ApiImplicitParam(name = "maintenanceRecord", value = "详细实体maintenanceRecord", required = true, dataType = "MaintenanceRecord")

src/main/java/com/steerinfo/associate/maintenancerecord/mapper/MaintenanceRecordMapper.xml

@@ -112,6 +112,9 @@
       <if test="equipmentName != null and equipmentName != ''">
         and EQUIPMENT_NAME = #{equipmentName}
       </if>
+      <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')
+      </if>
     </where>
   </sql>
   <sql id="whereLike">

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

@@ -31,6 +31,7 @@ import java.math.BigDecimal;
 
 /**
  * MeterBaseCar RESTful接口：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2022-01-10 10:09
  * 类描述
@@ -39,8 +40,8 @@ import java.math.BigDecimal;
  * 作者：generator
  * 参考：
  * 描述：MeterBaseCar RESTful接口
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasecars")
@@ -59,72 +60,72 @@ public class MeterBaseCarController extends BaseRESTfulController {
     @Autowired
     MeterBaseDriverMapper meterBaseDriverMapper;
 
-    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiOperation(value = "获取列表", notes = "分页查询")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
     })
     //@RequiresPermissions("meterbasecar:view")
     @GetMapping(value = "/")
-    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+    public RESTfulResult list(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
         PageList<MeterBaseCar> list = meterBaseCarService.queryForPage(parmas, pageNum, pageSize);
         return success(list);
     }
 
-    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
     })
     //@RequiresPermissions("meterbasecar:view")
     @GetMapping(value = "/like/")
-    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+    public RESTfulResult listLike(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
         PageList<MeterBaseCar> list = meterBaseCarService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
-    
-    @ApiOperation(value="创建", notes="根据MeterBaseCar对象创建")
+
+    @ApiOperation(value = "创建", notes = "根据MeterBaseCar对象创建")
     @ApiImplicitParam(name = "meterBaseCar", value = "详细实体meterBaseCar", required = true, dataType = "MeterBaseCar")
     //@RequiresPermissions("meterbasecar:create")
     @PostMapping(value = "/")
-    public RESTfulResult add(@ModelAttribute MeterBaseCar model){
+    public RESTfulResult add(@ModelAttribute MeterBaseCar model) {
         MeterBaseCar meterBaseCar = meterBaseCarService.add(model);
         return success(meterBaseCar);
     }
 
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("meterbasecar:view")
     @GetMapping(value = "/{id}")
-    public RESTfulResult get(@PathVariable String id){
+    public RESTfulResult get(@PathVariable String id) {
         MeterBaseCar meterBaseCar = meterBaseCarService.getById(id);
         return success(meterBaseCar);
     }
 
-    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseCar信息来更新详细信息")
+    @ApiOperation(value = "更新详细信息", notes = "根据url的id来指定更新对象，并根据传过来的meterBaseCar信息来更新详细信息")
     @ApiImplicitParams({
-        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
-        @ApiImplicitParam(name = "meterBaseCar", value = "详细实体meterBaseCar", required = true, dataType = "MeterBaseCar")
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "meterBaseCar", value = "详细实体meterBaseCar", required = true, dataType = "MeterBaseCar")
     })
     //@RequiresPermissions("meterbasecar:update")
-    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseCar model){
+    @PutMapping(value = "/{id}", produces = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseCar model) {
         model.setId(id);
         MeterBaseCar meterBaseCar = meterBaseCarService.modify(model);
         return success(meterBaseCar);
     }
 
-    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("meterbasecar:delete")
     @DeleteMapping(value = "/{id}")//String
-    public RESTfulResult delete(@PathVariable String id){
-    	List<String> list = Arrays.asList(id.split(","));
-    	if(ListUtils.isNotEmpty(list)) {
-	    	List<String> ids = ListUtils.convertList(list);
-			  meterBaseCarService.delete(ids);
-    	}
-      return success();
+    public RESTfulResult delete(@PathVariable String id) {
+        List<String> list = Arrays.asList(id.split(","));
+        if (ListUtils.isNotEmpty(list)) {
+            List<String> ids = ListUtils.convertList(list);
+            meterBaseCarService.delete(ids);
+        }
+        return success();
     }
 
     @ApiOperation(value = "启用", notes = "根据传过来的MeterBaseCusSupCar集合信息来更新详细信息")
@@ -180,8 +181,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
             // sso注册成功时，增加车辆表
             if (ssoMap.get("code").equals("1") && !"账号已被注册".equals(ssoMap.get("msg").toString())) {
                 return failed(null, ssoMap.get("msg").toString());
-            }
-            else {
+            } else {
                 // 清除SSO"账号已被注册"
                 msg = "";
 
@@ -194,14 +194,14 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 meterBaseDriverMapper.batchDeleteSelf(params.get("carNo").toString());
 
                 // 车辆表已存在时，跳过
-                if(queryList.size() == 0) {
+                if (queryList.size() == 0) {
                     // 新增车辆
                     MeterBaseCar car = new MeterBaseCar();
                     car.setCarNo(params.get("carNo").toString());
                     car.setValidFlag("0");
                     car.setCarTypeNo(params.get("carTypeNo").toString());
                     car.setCarTypeName(params.get("carTypeName").toString());
-                    if(params.get("carCarrierWeight") != null){
+                    if (params.get("carCarrierWeight") != null) {
                         new BigDecimal(params.get("carCarrierWeight").toString());
                     }
 
@@ -217,7 +217,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 // 拆分司机list，新增司机表
                 List<MeterBaseDriver> driverList = JSONObject.parseArray(params.get("driverList").toString(), MeterBaseDriver.class);
                 // 循环新增司机
-                for (MeterBaseDriver driver: driverList) {
+                for (MeterBaseDriver driver : driverList) {
                     // 检查司机是否存在
                     HashMap query = new HashMap();
                     query.put("carNo", params.get("carNo").toString());
@@ -226,13 +226,13 @@ public class MeterBaseCarController extends BaseRESTfulController {
 
                     List<MeterBaseCusSupCar> list = meterBaseDriverService.query(query);
                     // 司机表已存在时，跳过
-                    if(list.size() == 0){
+                    if (list.size() == 0) {
                         // 将司机信息加入实体
                         // 主键改为日期主键
 //                        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
 //                        String no = meterBaseDriverMapper.getNewID(sdf.format(new Date()));
 //                        driver.setId(sdf.format(new Date()) + no);
-                        driver.setId(params.get("carNo").toString()+driver.getTelNum());
+                        driver.setId(params.get("carNo").toString() + driver.getTelNum());
                         driver.setCarId(params.get("carNo").toString());
                         driver.setValidFlag("0");
 
@@ -243,7 +243,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
                         meterBaseDriverService.add(driver);
                     }
 
-                    if(com.steerinfo.util.StringUtils.isNotEmpty(msg)){
+                    if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                         break;
                     }
@@ -272,33 +272,29 @@ public class MeterBaseCarController extends BaseRESTfulController {
         Object ssodata = "";
 
         try {
-            if(params.get("carNo") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("carNo").toString())) {
+            if (params.get("carNo") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("carNo").toString())) {
                 msg = "车号不能为空！！";
-            }
-            else if(params.get("telNum") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("telNum").toString())) {
+            } else if (params.get("telNum") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("telNum").toString())) {
                 msg = "手机号不能为空！！";
-            }
-            else {
+            } else {
                 // 状态（0：服役；1:停役;2:删除）
                 params.put("validFlag", "0");
 
                 // 判断车号，司机手机号是否存在
                 List<MeterBaseCusSupCar> list = meterBaseDriverService.query(params);
-                if(list.size() >= 1){
+                if (list.size() >= 1) {
                     // sso登录
 
                     SSOUtil ssoUtil = new SSOUtil();
                     HashMap map = ssoUtil.ssoLogin(params, "");
 
-                    if(map.get("code").toString().equals("0")){
+                    if (map.get("code").toString().equals("0")) {
                         ssodata = map.get("data").toString();
-                    }
-                    else {
+                    } else {
                         msg = map.get("msg").toString();
                     }
 
-                }
-                else {
+                } else {
                     msg = "没有此车号或手机号";
                 }
             }
@@ -324,30 +320,26 @@ public class MeterBaseCarController extends BaseRESTfulController {
         String msg = "";
 
         try {
-            if(params.get("carNo") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("carNo").toString())) {
+            if (params.get("carNo") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("carNo").toString())) {
                 msg = "车号不能为空！！";
-            }
-            else if(params.get("telNum") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("telNum").toString())) {
+            } else if (params.get("telNum") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("telNum").toString())) {
                 msg = "手机号不能为空！！";
-            }
-            else {
+            } else {
                 // 状态（0：服役；1:停役;2:删除）
                 params.put("validFlag", "0");
 
                 // 判断车号，司机手机号是否存在
                 List<MeterBaseCusSupCar> list = meterBaseDriverService.query(params);
-                if(list.size() >= 1){
+                if (list.size() >= 1) {
                     // SSO修改密码
                     SSOUtil ssoUtil = new SSOUtil();
                     HashMap map = ssoUtil.ssoChangePwd(params);
 
-                    if(map.get("code").toString().equals("0")){
-                    }
-                    else {
+                    if (map.get("code").toString().equals("0")) {
+                    } else {
                         msg = map.get("msg").toString();
                     }
-                }
-                else {
+                } else {
                     msg = "没有此车号或手机号";
                 }
             }
@@ -373,19 +365,17 @@ public class MeterBaseCarController extends BaseRESTfulController {
         String msg = "";
 
         try {
-            if(params.get("carNo") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("carNo").toString())) {
+            if (params.get("carNo") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("carNo").toString())) {
                 msg = "车号不能为空！！";
-            }
-            else if(params.get("telNum") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("telNum").toString())) {
+            } else if (params.get("telNum") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("telNum").toString())) {
                 msg = "手机号不能为空！！";
-            }
-            else {
+            } else {
                 // 状态（0：服役；1:停役;2:删除）
                 params.put("validFlag", "0");
 
                 // 判断车号，司机手机号是否存在
                 List<MeterBaseDriver> list = meterBaseDriverService.query(params);
-                if(list.size() >= 1){
+                if (list.size() >= 1) {
                     // 获取车辆SSO ID
                     HashMap queryMap = new HashMap();
                     queryMap.put("carNo", params.get("carNo").toString());
@@ -393,13 +383,12 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     MeterBaseCar car = meterBaseCarService.getByParams(queryMap);
 
                     // 通过车辆SSO ID重置密码
-                    if(car != null){
+                    if (car != null) {
                         // SSO重置密码
                         SSOUtil ssoUtil = new SSOUtil();
-                        msg = ssoUtil.ssoResetPwd(car.getSsoId(), params.get("newpassword").toString(),"");
+                        msg = ssoUtil.ssoResetPwd(car.getSsoId(), params.get("newpassword").toString(), "");
                     }
-                }
-                else {
+                } else {
                     msg = "没有此车号或手机号";
                 }
             }
@@ -430,7 +419,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
             query.put("validFlag", "0");
 
             List<MeterBaseCar> list = meterBaseCarService.query(query);
-            if(list.size() == 0){
+            if (list.size() == 0) {
                 // sso注册
                 SSOUtil ssoUtil = new SSOUtil();
                 HashMap ssoMap = ssoUtil.ssoRegister(params);
@@ -438,8 +427,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 // sso注册成功时，增加车辆表
                 if (ssoMap.get("code").equals("1")) {
                     return failed(null, ssoMap.get("msg").toString());
-                }
-                else {
+                } else {
                     // sso注册成功时，增加车辆表
                     if (com.steerinfo.util.StringUtils.isNotEmpty(msg) && !msg.equals("账号已被注册")) {
                         return failed(null, msg);
@@ -447,13 +435,17 @@ public class MeterBaseCarController extends BaseRESTfulController {
                         MeterBaseCar car = new MeterBaseCar();
                         // 将车辆类型，载重信息加入实体
                         car.setCarNo(params.get("carNo").toString());
-
                         car.setCarTypeNo(params.get("carTypeNo").toString());
                         car.setCarTypeName(params.get("carTypeName").toString());
                         if (params.get("carCarrierWeight") != null) {
                             car.setCarCarrierWeight(new BigDecimal(params.get("carCarrierWeight").toString()));
                         }
-
+                        if (params.get("carSelfWeight") != null) {
+                            car.setCarSelfWeight(new BigDecimal(params.get("carSelfWeight").toString()));
+                        }
+                        car.setMnemonicCode(params.get("mnemonicCode").toString());
+                        car.setCustomerSupplierName(params.get("customerSupplierName").toString());
+                        car.setMemo(params.get("memo").toString());
                         car.setCreateManNo("admin");
                         car.setCreateManName("admins");
                         car.setCreateTime(new Date());
@@ -461,8 +453,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
                         msg = meterBaseCarService.checkandadd(car);
                     }
                 }
-            }
-            else {
+            } else {
                 msg = "车辆已存在";
             }
 
@@ -477,4 +468,71 @@ public class MeterBaseCarController extends BaseRESTfulController {
         }
         return success();
     }
+
+    @ApiOperation(value = "PC新增司机", notes = "PC新增司机")
+    @Transactional
+    @PostMapping(value = "/adddriver")
+    public RESTfulResult addDriver(@RequestBody HashMap params) {
+        try {
+            String msg = "";
+            // 拆分司机list，新增司机表
+            List<MeterBaseDriver> driverList = JSONObject.parseArray(params.get("driverList").toString(), MeterBaseDriver.class);
+            // 循环新增司机
+            for (MeterBaseDriver driver : driverList) {
+                // 检查司机是否存在
+                HashMap query = new HashMap();
+                query.put("carNo", params.get("carNo").toString());
+                query.put("telNum", driver.getTelNum());
+                query.put("validFlag", "0");
+
+                List<MeterBaseDriver> list = meterBaseDriverService.query(query);
+                // 司机表已存在时，跳过
+                if (list.size() == 0) {
+                    // 将司机信息加入实体
+                    // 主键改为日期主键
+                    driver.setId(params.get("carNo").toString() + driver.getTelNum());
+                    driver.setCarId(params.get("carNo").toString());
+                    driver.setValidFlag("0");
+                    driver.setCreateManNo("admin");
+                    driver.setCreateManName("admins");
+                    driver.setCreateTime(new Date());
+                    meterBaseDriverService.add(driver);
+                }
+                if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    break;
+                }
+            }
+            if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return failed(null, msg);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+        return success();
+    }
+
+    @ApiOperation(value = "批量删除", notes = "根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasecar:delete")
+    @PutMapping(value = "/deleteBatch")//String
+    public RESTfulResult deleteBatch(@RequestBody List<MeterBaseCar> model) {
+        try {
+            List<String> list = new ArrayList<>();
+            for(MeterBaseCar models : model){
+                list.add(models.getCarNo());
+            }
+            meterBaseDriverMapper.deleteCarById(list);
+            meterBaseCarMapper.deleteCarById(list);
+            return success();
+        }
+        catch (Exception e){
+            e.printStackTrace();
+            return failed(null,"操作异常，请确认");
+        }
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.baseinfo.meterbasecar.mapper;
 
 import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
+import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
 import java.util.List;
@@ -16,5 +17,6 @@ public interface MeterBaseCarMapper extends IBaseMapper<MeterBaseCar, String> {
 
     List<MeterBaseCar> selectForUpdate(Map<String, Object> parameters);
 
-    void batchDeleteSelf(@Param(value = "carNo") String carNo);
+    void deleteCarById(@Param("list") List<String> driverNos);
+
 }

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

@@ -640,9 +640,13 @@
     </where>
   </select>
 
-<!--  批量删除车辆对应司机信息-->
-  <delete id="batchDeleteSelf" parameterType="java.lang.String">
-    delete from METER_BASE_CAR
-    where car_no = #{carNo}
-  </delete>
+<!--  批量删除车辆-->
+  <update id="deleteCarById" parameterType="java.util.List">
+    update METER_BASE_CAR set VALID_FLAG = '2' where CAR_NO in
+    <foreach item="carNos" collection="list" open="(" separator="," close=")">
+      #{carNos}
+    </foreach>
+  </update>
+
+
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasecar/service/IMeterBaseCarService.java

@@ -1,5 +1,6 @@
 package com.steerinfo.baseinfo.meterbasecar.service;
 
+import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
 import java.util.Date;
@@ -27,4 +28,5 @@ public interface IMeterBaseCarService extends IBaseService<MeterBaseCar, String>
     String abolish(List<MeterBaseCar> models);
 
     String checkandupdate(String id,MeterBaseCar model);
+
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.baseinfo.meterbasecar.service.impl;
 
+import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
@@ -122,6 +123,8 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
         return "";
     }
 
+
+
     private String check(MeterBaseCar model)
     {
         if (model == null){

src/main/java/com/steerinfo/baseinfo/meterbasedriver/controller/MeterBaseDriverController.java

@@ -1,7 +1,11 @@
 package com.steerinfo.baseinfo.meterbasedriver.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.baseinfo.meterbasecar.mapper.MeterBaseCarMapper;
+import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
 import com.steerinfo.baseinfo.meterbasecussupcar.model.MeterBaseCusSupCar;
+import com.steerinfo.baseinfo.meterbasedriver.mapper.MeterBaseDriverMapper;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
@@ -10,6 +14,7 @@ import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
 import com.steerinfo.baseinfo.meterbasedriver.service.IMeterBaseDriverService;
 import com.steerinfo.util.StringUtils;
+import feign.Param;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -44,6 +49,9 @@ public class MeterBaseDriverController extends BaseRESTfulController {
     @Autowired
     IMeterBaseDriverService meterBaseDriverService;
 
+    @Autowired
+    MeterBaseDriverMapper meterBaseDriverMapper;
+
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -122,4 +130,33 @@ public class MeterBaseDriverController extends BaseRESTfulController {
     	}
       return success();
     }
+
+    @ApiOperation(value="批量删除", notes="根据list删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasedriver:delete")
+    @DeleteMapping(value = "/{delDriverList}")//String
+    public RESTfulResult deleteDriver(@RequestBody JSONArray driverList){
+        List list = JSONArray.parseArray(driverList.toJSONString());
+        meterBaseDriverService.deleteDriverById(list);
+        return success();
+    }
+
+    @ApiOperation(value="批量删除", notes="根据list删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasedriver:delete")
+    @PutMapping(value = "/deleteBatch")//String
+    public RESTfulResult deleteBatch(@RequestBody List<MeterBaseDriver> model){
+        try {
+            List<String> list = new ArrayList<>();
+            for(MeterBaseDriver models : model){
+                list.add(models.getDriverNo());
+            }
+            meterBaseDriverMapper.deleteDriverById(list);
+            return success();
+        }
+        catch (Exception e){
+            e.printStackTrace();
+            return failed(null,"操作异常，请确认");
+        }
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.baseinfo.meterbasedriver.mapper;
 import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.List;
 
 import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
@@ -12,4 +13,11 @@ public interface MeterBaseDriverMapper extends IBaseMapper<MeterBaseDriver, Stri
     void batchDeleteSelf(@Param(value = "carId") String carId);
 
     String getNewID(@org.apache.ibatis.annotations.Param(value="afl")String afl);
+// 批量删除
+    int deleteByBatch(String[] array);
+
+//    void deleteDriverById(List<MeterBaseDriver> deleteList);
+    void deleteDriverById(@Param("list") List<String> driverNos);
+
+    void deleteCarById(@Param("list") List<String> carNos);
 }

src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.xml

@@ -502,4 +502,33 @@
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(DRIVER_NO,9))),0) + 1,4,'0') DRIVER_NO
     FROM METER_BASE_DRIVER where instr(DRIVER_NO,#{afl,jdbcType=VARCHAR})>0
   </select>
+<!--  批量删除-->
+  <delete id="deleteByBatch" parameterType="java.lang.String">
+    delete from METER_BASE_DRIVER
+    where DRIVER_NO IN ()
+    <foreach collection="array" item="driverNo" open="(" separator="," close=")">
+      #{driverNo}
+    </foreach>
+  </delete>
+
+<!--  <delete id="deleteDriverById" parameterType="java.util.List">-->
+<!--    delete from METER_BASE_DRIVER dr where dr.DRIVER_NO in-->
+<!--    <foreach item="item" collection="deleteList" open="(" separator="," close=")">-->
+<!--      #{item.driverNo,jdbcType=VARCHAR}-->
+<!--    </foreach>-->
+<!--  </delete>-->
+
+  <update id="deleteDriverById" parameterType="java.util.List">
+    update METER_BASE_DRIVER set VALID_FLAG = '2' where DRIVER_NO in
+    <foreach item="driverNos" collection="list" open="(" separator="," close=")">
+      #{driverNos}
+    </foreach>
+  </update>
+
+  <update id="deleteCarById" parameterType="java.util.List">
+    update METER_BASE_DRIVER set VALID_FLAG = '2' where CAR_ID in
+    <foreach item="carNos" collection="list" open="(" separator="," close=")">
+      #{carNos}
+    </foreach>
+  </update>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasescalepoint/mapper/MeterBaseScalePointMapper.xml

@@ -30,21 +30,30 @@
     <result column="SPOT_TYPE_NAME" jdbcType="VARCHAR" property="spotTypeName" />
     <result column="WEIGHT_ZERO" jdbcType="DECIMAL" property="weightZero" />
     <result column="MONITOR_USER_IP" jdbcType="VARCHAR" property="monitorUserIp" />
+    <result column="IS_HELP" jdbcType="VARCHAR" property="isHelp" />
+    <result column="IS_TAKE_OVER" jdbcType="VARCHAR" property="isTakeOver" />
+    <result column="LED_WRITER" jdbcType="VARCHAR" property="ledWriter" />
+    <result column="RFID_CAR" jdbcType="VARCHAR" property="rfidCar" />
+    <result column="PHOTO_CAR" jdbcType="VARCHAR" property="photoCar" />
+    <result column="WGT_ERR" jdbcType="VARCHAR" property="wgtErr" />
+    <result column="USER_IP" jdbcType="VARCHAR" property="userIp" />
   </resultMap>
   <sql id="columns">
-    SCALE_POINT_NO, SCALE_POINT_NAME, BASE_SPOT_NO, BASE_SPOT_NAME, WEIGH_INSTRUMENT_MODEL,
-    WEIGH_INSTRUMENT_PARAM, MOXA_IP, MOXA_PORT, VALID_FLAG, LAST_TIME, WEIGHT_TIME, USER_NO,
-    MONITOR_USER_NO, WEIGHT, COLLECTION_CODE, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
-    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
-    SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO, MONITOR_USER_IP
+    SCALE_POINT_NO, SCALE_POINT_NAME, BASE_SPOT_NO, BASE_SPOT_NAME, WEIGH_INSTRUMENT_MODEL, 
+    WEIGH_INSTRUMENT_PARAM, MOXA_IP, MOXA_PORT, VALID_FLAG, LAST_TIME, WEIGHT_TIME, USER_NO, 
+    MONITOR_USER_NO, WEIGHT, COLLECTION_CODE, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+    SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO, MONITOR_USER_IP, IS_HELP, IS_TAKE_OVER, 
+    LED_WRITER, RFID_CAR, PHOTO_CAR, WGT_ERR, USER_IP
   </sql>
   <sql id="columns_alias">
-    t.SCALE_POINT_NO, t.SCALE_POINT_NAME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.WEIGH_INSTRUMENT_MODEL,
-    t.WEIGH_INSTRUMENT_PARAM, t.MOXA_IP, t.MOXA_PORT, t.VALID_FLAG, t.LAST_TIME, t.WEIGHT_TIME,
-    t.USER_NO, t.MONITOR_USER_NO, t.WEIGHT, t.COLLECTION_CODE, t.CREATE_MAN_NO, t.CREATE_MAN_NAME,
-    t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO,
-    t.DELETE_MAN_NAME, t.DELETE_TIME, t.SPOT_TYPE_NO, t.SPOT_TYPE_NAME, t.WEIGHT_ZERO,
-    t.MONITOR_USER_IP
+    t.SCALE_POINT_NO, t.SCALE_POINT_NAME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.WEIGH_INSTRUMENT_MODEL, 
+    t.WEIGH_INSTRUMENT_PARAM, t.MOXA_IP, t.MOXA_PORT, t.VALID_FLAG, t.LAST_TIME, t.WEIGHT_TIME, 
+    t.USER_NO, t.MONITOR_USER_NO, t.WEIGHT, t.COLLECTION_CODE, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, 
+    t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, 
+    t.DELETE_MAN_NAME, t.DELETE_TIME, t.SPOT_TYPE_NO, t.SPOT_TYPE_NAME, t.WEIGHT_ZERO, 
+    t.MONITOR_USER_IP, t.IS_HELP, t.IS_TAKE_OVER, t.LED_WRITER, t.RFID_CAR, t.PHOTO_CAR, 
+    t.WGT_ERR, t.USER_IP
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_BASE_SCALE_POINT
@@ -53,7 +62,7 @@
     SELECT <include refid="columns_alias"/> FROM METER_BASE_SCALE_POINT t
   </sql>
   <sql id="where">
-    <where>
+    <where> 
       <if test="scalePointNo != null and scalePointNo != ''">
         and SCALE_POINT_NO = #{scalePointNo}
       </if>
@@ -138,10 +147,31 @@
       <if test="monitorUserIp != null and monitorUserIp != ''">
         and MONITOR_USER_IP = #{monitorUserIp}
       </if>
+      <if test="isHelp != null and isHelp != ''">
+        and IS_HELP = #{isHelp}
+      </if>
+      <if test="isTakeOver != null and isTakeOver != ''">
+        and IS_TAKE_OVER = #{isTakeOver}
+      </if>
+      <if test="ledWriter != null and ledWriter != ''">
+        and LED_WRITER = #{ledWriter}
+      </if>
+      <if test="rfidCar != null and rfidCar != ''">
+        and RFID_CAR = #{rfidCar}
+      </if>
+      <if test="photoCar != null and photoCar != ''">
+        and PHOTO_CAR = #{photoCar}
+      </if>
+      <if test="wgtErr != null and wgtErr != ''">
+        and WGT_ERR = #{wgtErr}
+      </if>
+      <if test="userIp != null and userIp != ''">
+        and USER_IP = #{userIp}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where>
+    <where> 
       <if test="scalePointNo != null and scalePointNo != ''">
         and SCALE_POINT_NO LIKE '%${scalePointNo}%'
       </if>
@@ -226,6 +256,27 @@
       <if test="monitorUserIp != null and monitorUserIp != ''">
         and MONITOR_USER_IP LIKE '%${monitorUserIp}%'
       </if>
+      <if test="isHelp != null and isHelp != ''">
+        and IS_HELP LIKE '%${isHelp}%'
+      </if>
+      <if test="isTakeOver != null and isTakeOver != ''">
+        and IS_TAKE_OVER LIKE '%${isTakeOver}%'
+      </if>
+      <if test="ledWriter != null and ledWriter != ''">
+        and LED_WRITER LIKE '%${ledWriter}%'
+      </if>
+      <if test="rfidCar != null and rfidCar != ''">
+        and RFID_CAR LIKE '%${rfidCar}%'
+      </if>
+      <if test="photoCar != null and photoCar != ''">
+        and PHOTO_CAR LIKE '%${photoCar}%'
+      </if>
+      <if test="wgtErr != null and wgtErr != ''">
+        and WGT_ERR LIKE '%${wgtErr}%'
+      </if>
+      <if test="userIp != null and userIp != ''">
+        and USER_IP LIKE '%${userIp}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -234,110 +285,135 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_BASE_SCALE_POINT
-    where 1!=1
-    <if test="scalePointName != null and scalePointName != ''">
-      or SCALE_POINT_NAME = #{scalePointName}
-    </if>
-    <if test="baseSpotNo != null and baseSpotNo != ''">
-      or BASE_SPOT_NO = #{baseSpotNo}
-    </if>
-    <if test="baseSpotName != null and baseSpotName != ''">
-      or BASE_SPOT_NAME = #{baseSpotName}
-    </if>
-    <if test="weighInstrumentModel != null and weighInstrumentModel != ''">
-      or WEIGH_INSTRUMENT_MODEL = #{weighInstrumentModel}
-    </if>
-    <if test="weighInstrumentParam != null and weighInstrumentParam != ''">
-      or WEIGH_INSTRUMENT_PARAM = #{weighInstrumentParam}
-    </if>
-    <if test="moxaIp != null and moxaIp != ''">
-      or MOXA_IP = #{moxaIp}
-    </if>
-    <if test="moxaPort != null and moxaPort != ''">
-      or MOXA_PORT = #{moxaPort}
-    </if>
-    <if test="validFlag != null and validFlag != ''">
-      or VALID_FLAG = #{validFlag}
-    </if>
-    <if test="lastTime != null">
-      or TO_CHAR(LAST_TIME,'yyyy-MM-dd') = '#{lastTime}'
-    </if>
-    <if test="weightTime != null">
-      or TO_CHAR(WEIGHT_TIME,'yyyy-MM-dd') = '#{weightTime}'
-    </if>
-    <if test="userNo != null and userNo != ''">
-      or USER_NO = #{userNo}
-    </if>
-    <if test="monitorUserNo != null and monitorUserNo != ''">
-      or MONITOR_USER_NO = #{monitorUserNo}
-    </if>
-    <if test="weight != null">
-      or WEIGHT = #{weight}
-    </if>
-    <if test="collectionCode != null and collectionCode != ''">
-      or COLLECTION_CODE = #{collectionCode}
-    </if>
-    <if test="createManNo != null and createManNo != ''">
-      or CREATE_MAN_NO = #{createManNo}
-    </if>
-    <if test="createManName != null and createManName != ''">
-      or CREATE_MAN_NAME = #{createManName}
-    </if>
-    <if test="createTime != null">
-      or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
-    </if>
-    <if test="updateManNo != null and updateManNo != ''">
-      or UPDATE_MAN_NO = #{updateManNo}
-    </if>
-    <if test="updateManName != null and updateManName != ''">
-      or UPDATE_MAN_NAME = #{updateManName}
-    </if>
-    <if test="updateTime != null">
-      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-    </if>
-    <if test="deleteManNo != null and deleteManNo != ''">
-      or DELETE_MAN_NO = #{deleteManNo}
-    </if>
-    <if test="deleteManName != null and deleteManName != ''">
-      or DELETE_MAN_NAME = #{deleteManName}
-    </if>
-    <if test="deleteTime != null">
-      or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
-    </if>
-    <if test="spotTypeNo != null and spotTypeNo != ''">
-      or SPOT_TYPE_NO = #{spotTypeNo}
-    </if>
-    <if test="spotTypeName != null and spotTypeName != ''">
-      or SPOT_TYPE_NAME = #{spotTypeName}
-    </if>
-    <if test="weightZero != null">
-      or WEIGHT_ZERO = #{weightZero}
-    </if>
-    <if test="monitorUserIp != null and monitorUserIp != ''">
-      or MONITOR_USER_IP = #{monitorUserIp}
-    </if>
+    where 1!=1 
+      <if test="scalePointName != null and scalePointName != ''">
+        or SCALE_POINT_NAME = #{scalePointName}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        or BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        or BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="weighInstrumentModel != null and weighInstrumentModel != ''">
+        or WEIGH_INSTRUMENT_MODEL = #{weighInstrumentModel}
+      </if>
+      <if test="weighInstrumentParam != null and weighInstrumentParam != ''">
+        or WEIGH_INSTRUMENT_PARAM = #{weighInstrumentParam}
+      </if>
+      <if test="moxaIp != null and moxaIp != ''">
+        or MOXA_IP = #{moxaIp}
+      </if>
+      <if test="moxaPort != null and moxaPort != ''">
+        or MOXA_PORT = #{moxaPort}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </if>
+      <if test="lastTime != null">
+        or TO_CHAR(LAST_TIME,'yyyy-MM-dd') = '#{lastTime}'
+      </if>
+      <if test="weightTime != null">
+        or TO_CHAR(WEIGHT_TIME,'yyyy-MM-dd') = '#{weightTime}'
+      </if>
+      <if test="userNo != null and userNo != ''">
+        or USER_NO = #{userNo}
+      </if>
+      <if test="monitorUserNo != null and monitorUserNo != ''">
+        or MONITOR_USER_NO = #{monitorUserNo}
+      </if>
+      <if test="weight != null">
+        or WEIGHT = #{weight}
+      </if>
+      <if test="collectionCode != null and collectionCode != ''">
+        or COLLECTION_CODE = #{collectionCode}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        or UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        or UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="deleteManNo != null and deleteManNo != ''">
+        or DELETE_MAN_NO = #{deleteManNo}
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        or DELETE_MAN_NAME = #{deleteManName}
+      </if>
+      <if test="deleteTime != null">
+        or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
+      </if>
+      <if test="spotTypeNo != null and spotTypeNo != ''">
+        or SPOT_TYPE_NO = #{spotTypeNo}
+      </if>
+      <if test="spotTypeName != null and spotTypeName != ''">
+        or SPOT_TYPE_NAME = #{spotTypeName}
+      </if>
+      <if test="weightZero != null">
+        or WEIGHT_ZERO = #{weightZero}
+      </if>
+      <if test="monitorUserIp != null and monitorUserIp != ''">
+        or MONITOR_USER_IP = #{monitorUserIp}
+      </if>
+      <if test="isHelp != null and isHelp != ''">
+        or IS_HELP = #{isHelp}
+      </if>
+      <if test="isTakeOver != null and isTakeOver != ''">
+        or IS_TAKE_OVER = #{isTakeOver}
+      </if>
+      <if test="ledWriter != null and ledWriter != ''">
+        or LED_WRITER = #{ledWriter}
+      </if>
+      <if test="rfidCar != null and rfidCar != ''">
+        or RFID_CAR = #{rfidCar}
+      </if>
+      <if test="photoCar != null and photoCar != ''">
+        or PHOTO_CAR = #{photoCar}
+      </if>
+      <if test="wgtErr != null and wgtErr != ''">
+        or WGT_ERR = #{wgtErr}
+      </if>
+      <if test="userIp != null and userIp != ''">
+        or USER_IP = #{userIp}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
-    insert into METER_BASE_SCALE_POINT (SCALE_POINT_NO, SCALE_POINT_NAME, BASE_SPOT_NO,
-                                        BASE_SPOT_NAME, WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM,
-                                        MOXA_IP, MOXA_PORT, VALID_FLAG,
-                                        LAST_TIME, WEIGHT_TIME, USER_NO,
-                                        MONITOR_USER_NO, WEIGHT, COLLECTION_CODE,
-                                        CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
-                                        UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
-                                        DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
-                                        SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO,
-                                        MONITOR_USER_IP)
-    values (#{scalePointNo,jdbcType=VARCHAR}, #{scalePointName,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR},
-            #{baseSpotName,jdbcType=VARCHAR}, #{weighInstrumentModel,jdbcType=VARCHAR}, #{weighInstrumentParam,jdbcType=VARCHAR},
-            #{moxaIp,jdbcType=VARCHAR}, #{moxaPort,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR},
-            #{lastTime,jdbcType=TIMESTAMP}, #{weightTime,jdbcType=TIMESTAMP}, #{userNo,jdbcType=VARCHAR},
-            #{monitorUserNo,jdbcType=VARCHAR}, #{weight,jdbcType=DECIMAL}, #{collectionCode,jdbcType=VARCHAR},
-            #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
-            #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-            #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP},
-            #{spotTypeNo,jdbcType=VARCHAR}, #{spotTypeName,jdbcType=VARCHAR}, #{weightZero,jdbcType=DECIMAL},
-            #{monitorUserIp,jdbcType=VARCHAR})
+    insert into METER_BASE_SCALE_POINT (SCALE_POINT_NO, SCALE_POINT_NAME, BASE_SPOT_NO, 
+      BASE_SPOT_NAME, WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM, 
+      MOXA_IP, MOXA_PORT, VALID_FLAG, 
+      LAST_TIME, WEIGHT_TIME, USER_NO, 
+      MONITOR_USER_NO, WEIGHT, COLLECTION_CODE, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO, 
+      MONITOR_USER_IP, IS_HELP, IS_TAKE_OVER, 
+      LED_WRITER, RFID_CAR, PHOTO_CAR, 
+      WGT_ERR, USER_IP)
+    values (#{scalePointNo,jdbcType=VARCHAR}, #{scalePointName,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, 
+      #{baseSpotName,jdbcType=VARCHAR}, #{weighInstrumentModel,jdbcType=VARCHAR}, #{weighInstrumentParam,jdbcType=VARCHAR}, 
+      #{moxaIp,jdbcType=VARCHAR}, #{moxaPort,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, 
+      #{lastTime,jdbcType=TIMESTAMP}, #{weightTime,jdbcType=TIMESTAMP}, #{userNo,jdbcType=VARCHAR}, 
+      #{monitorUserNo,jdbcType=VARCHAR}, #{weight,jdbcType=DECIMAL}, #{collectionCode,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, 
+      #{spotTypeNo,jdbcType=VARCHAR}, #{spotTypeName,jdbcType=VARCHAR}, #{weightZero,jdbcType=DECIMAL}, 
+      #{monitorUserIp,jdbcType=VARCHAR}, #{isHelp,jdbcType=VARCHAR}, #{isTakeOver,jdbcType=VARCHAR}, 
+      #{ledWriter,jdbcType=VARCHAR}, #{rfidCar,jdbcType=VARCHAR}, #{photoCar,jdbcType=VARCHAR}, 
+      #{wgtErr,jdbcType=VARCHAR}, #{userIp,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
     insert into METER_BASE_SCALE_POINT
@@ -426,6 +502,27 @@
       <if test="monitorUserIp != null">
         MONITOR_USER_IP,
       </if>
+      <if test="isHelp != null">
+        IS_HELP,
+      </if>
+      <if test="isTakeOver != null">
+        IS_TAKE_OVER,
+      </if>
+      <if test="ledWriter != null">
+        LED_WRITER,
+      </if>
+      <if test="rfidCar != null">
+        RFID_CAR,
+      </if>
+      <if test="photoCar != null">
+        PHOTO_CAR,
+      </if>
+      <if test="wgtErr != null">
+        WGT_ERR,
+      </if>
+      <if test="userIp != null">
+        USER_IP,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="scalePointNo != null">
@@ -512,37 +609,65 @@
       <if test="monitorUserIp != null">
         #{monitorUserIp,jdbcType=VARCHAR},
       </if>
+      <if test="isHelp != null">
+        #{isHelp,jdbcType=VARCHAR},
+      </if>
+      <if test="isTakeOver != null">
+        #{isTakeOver,jdbcType=VARCHAR},
+      </if>
+      <if test="ledWriter != null">
+        #{ledWriter,jdbcType=VARCHAR},
+      </if>
+      <if test="rfidCar != null">
+        #{rfidCar,jdbcType=VARCHAR},
+      </if>
+      <if test="photoCar != null">
+        #{photoCar,jdbcType=VARCHAR},
+      </if>
+      <if test="wgtErr != null">
+        #{wgtErr,jdbcType=VARCHAR},
+      </if>
+      <if test="userIp != null">
+        #{userIp,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
     update METER_BASE_SCALE_POINT
     set SCALE_POINT_NAME = #{scalePointName,jdbcType=VARCHAR},
-        BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
-        BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
-        WEIGH_INSTRUMENT_MODEL = #{weighInstrumentModel,jdbcType=VARCHAR},
-        WEIGH_INSTRUMENT_PARAM = #{weighInstrumentParam,jdbcType=VARCHAR},
-        MOXA_IP = #{moxaIp,jdbcType=VARCHAR},
-        MOXA_PORT = #{moxaPort,jdbcType=VARCHAR},
-        VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
-        LAST_TIME = #{lastTime,jdbcType=TIMESTAMP},
-        WEIGHT_TIME = #{weightTime,jdbcType=TIMESTAMP},
-        USER_NO = #{userNo,jdbcType=VARCHAR},
-        MONITOR_USER_NO = #{monitorUserNo,jdbcType=VARCHAR},
-        WEIGHT = #{weight,jdbcType=DECIMAL},
-        COLLECTION_CODE = #{collectionCode,jdbcType=VARCHAR},
-        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-        DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-        DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
-        SPOT_TYPE_NO = #{spotTypeNo,jdbcType=VARCHAR},
-        SPOT_TYPE_NAME = #{spotTypeName,jdbcType=VARCHAR},
-        WEIGHT_ZERO = #{weightZero,jdbcType=DECIMAL},
-        MONITOR_USER_IP = #{monitorUserIp,jdbcType=VARCHAR}
+      BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      WEIGH_INSTRUMENT_MODEL = #{weighInstrumentModel,jdbcType=VARCHAR},
+      WEIGH_INSTRUMENT_PARAM = #{weighInstrumentParam,jdbcType=VARCHAR},
+      MOXA_IP = #{moxaIp,jdbcType=VARCHAR},
+      MOXA_PORT = #{moxaPort,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+      LAST_TIME = #{lastTime,jdbcType=TIMESTAMP},
+      WEIGHT_TIME = #{weightTime,jdbcType=TIMESTAMP},
+      USER_NO = #{userNo,jdbcType=VARCHAR},
+      MONITOR_USER_NO = #{monitorUserNo,jdbcType=VARCHAR},
+      WEIGHT = #{weight,jdbcType=DECIMAL},
+      COLLECTION_CODE = #{collectionCode,jdbcType=VARCHAR},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
+      DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
+      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      SPOT_TYPE_NO = #{spotTypeNo,jdbcType=VARCHAR},
+      SPOT_TYPE_NAME = #{spotTypeName,jdbcType=VARCHAR},
+      WEIGHT_ZERO = #{weightZero,jdbcType=DECIMAL},
+      MONITOR_USER_IP = #{monitorUserIp,jdbcType=VARCHAR},
+      IS_HELP = #{isHelp,jdbcType=VARCHAR},
+      IS_TAKE_OVER = #{isTakeOver,jdbcType=VARCHAR},
+      LED_WRITER = #{ledWriter,jdbcType=VARCHAR},
+      RFID_CAR = #{rfidCar,jdbcType=VARCHAR},
+      PHOTO_CAR = #{photoCar,jdbcType=VARCHAR},
+      WGT_ERR = #{wgtErr,jdbcType=VARCHAR},
+      USER_IP = #{userIp,jdbcType=VARCHAR}
     where SCALE_POINT_NO = #{scalePointNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
@@ -629,6 +754,27 @@
       <if test="monitorUserIp != null">
         MONITOR_USER_IP = #{monitorUserIp,jdbcType=VARCHAR},
       </if>
+      <if test="isHelp != null">
+        IS_HELP = #{isHelp,jdbcType=VARCHAR},
+      </if>
+      <if test="isTakeOver != null">
+        IS_TAKE_OVER = #{isTakeOver,jdbcType=VARCHAR},
+      </if>
+      <if test="ledWriter != null">
+        LED_WRITER = #{ledWriter,jdbcType=VARCHAR},
+      </if>
+      <if test="rfidCar != null">
+        RFID_CAR = #{rfidCar,jdbcType=VARCHAR},
+      </if>
+      <if test="photoCar != null">
+        PHOTO_CAR = #{photoCar,jdbcType=VARCHAR},
+      </if>
+      <if test="wgtErr != null">
+        WGT_ERR = #{wgtErr,jdbcType=VARCHAR},
+      </if>
+      <if test="userIp != null">
+        USER_IP = #{userIp,jdbcType=VARCHAR},
+      </if>
     </set>
     where SCALE_POINT_NO = #{scalePointNo,jdbcType=VARCHAR}
   </update>
@@ -639,164 +785,194 @@
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="where"/>
-    order by CREATE_TIME  desc
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
-    order by CREATE_TIME  desc
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_BASE_SCALE_POINT
-    (SCALE_POINT_NO,
-    SCALE_POINT_NAME, BASE_SPOT_NO, BASE_SPOT_NAME,
-    WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM,
-    MOXA_IP, MOXA_PORT, VALID_FLAG,
-    LAST_TIME, WEIGHT_TIME, USER_NO,
-    MONITOR_USER_NO, WEIGHT, COLLECTION_CODE,
-    CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
-    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
-    DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
-    SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO,
-    MONITOR_USER_IP)
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.scalePointNo,jdbcType=VARCHAR},
-    #{item.scalePointName,jdbcType=VARCHAR}, #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR},
-    #{item.weighInstrumentModel,jdbcType=VARCHAR}, #{item.weighInstrumentParam,jdbcType=VARCHAR},
-    #{item.moxaIp,jdbcType=VARCHAR}, #{item.moxaPort,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR},
-    #{item.lastTime,jdbcType=TIMESTAMP}, #{item.weightTime,jdbcType=TIMESTAMP}, #{item.userNo,jdbcType=VARCHAR},
-    #{item.monitorUserNo,jdbcType=VARCHAR}, #{item.weight,jdbcType=DECIMAL}, #{item.collectionCode,jdbcType=VARCHAR},
-    #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
-    #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-    #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP},
-    #{item.spotTypeNo,jdbcType=VARCHAR}, #{item.spotTypeName,jdbcType=VARCHAR}, #{item.weightZero,jdbcType=DECIMAL},
-    #{item.monitorUserIp,jdbcType=VARCHAR} from dual
-  </foreach> )
+    insert into METER_BASE_SCALE_POINT 
+      (SCALE_POINT_NO, 
+      SCALE_POINT_NAME, BASE_SPOT_NO, BASE_SPOT_NAME, 
+      WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM, 
+      MOXA_IP, MOXA_PORT, VALID_FLAG, 
+      LAST_TIME, WEIGHT_TIME, USER_NO, 
+      MONITOR_USER_NO, WEIGHT, COLLECTION_CODE, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO, 
+      MONITOR_USER_IP, IS_HELP, IS_TAKE_OVER, 
+      LED_WRITER, RFID_CAR, PHOTO_CAR, 
+      WGT_ERR, USER_IP)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.scalePointNo,jdbcType=VARCHAR}, 
+      #{item.scalePointName,jdbcType=VARCHAR}, #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, 
+      #{item.weighInstrumentModel,jdbcType=VARCHAR}, #{item.weighInstrumentParam,jdbcType=VARCHAR}, 
+      #{item.moxaIp,jdbcType=VARCHAR}, #{item.moxaPort,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR}, 
+      #{item.lastTime,jdbcType=TIMESTAMP}, #{item.weightTime,jdbcType=TIMESTAMP}, #{item.userNo,jdbcType=VARCHAR}, 
+      #{item.monitorUserNo,jdbcType=VARCHAR}, #{item.weight,jdbcType=DECIMAL}, #{item.collectionCode,jdbcType=VARCHAR}, 
+      #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, 
+      #{item.spotTypeNo,jdbcType=VARCHAR}, #{item.spotTypeName,jdbcType=VARCHAR}, #{item.weightZero,jdbcType=DECIMAL}, 
+      #{item.monitorUserIp,jdbcType=VARCHAR}, #{item.isHelp,jdbcType=VARCHAR}, #{item.isTakeOver,jdbcType=VARCHAR}, 
+      #{item.ledWriter,jdbcType=VARCHAR}, #{item.rfidCar,jdbcType=VARCHAR}, #{item.photoCar,jdbcType=VARCHAR}, 
+      #{item.wgtErr,jdbcType=VARCHAR}, #{item.userIp,jdbcType=VARCHAR} from dual  
+   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-    update METER_BASE_SCALE_POINT
-    set
-    SCALE_POINT_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.scalePointNo,jdbcType=VARCHAR}
-    </foreach>
-    ,SCALE_POINT_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.scalePointName,jdbcType=VARCHAR}
-    </foreach>
-    ,BASE_SPOT_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
-    </foreach>
-    ,BASE_SPOT_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
-    </foreach>
-    ,WEIGH_INSTRUMENT_MODEL=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.weighInstrumentModel,jdbcType=VARCHAR}
-    </foreach>
-    ,WEIGH_INSTRUMENT_PARAM=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.weighInstrumentParam,jdbcType=VARCHAR}
-    </foreach>
-    ,MOXA_IP=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.moxaIp,jdbcType=VARCHAR}
-    </foreach>
-    ,MOXA_PORT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.moxaPort,jdbcType=VARCHAR}
-    </foreach>
-    ,VALID_FLAG=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
-    </foreach>
-    ,LAST_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.lastTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,WEIGHT_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.weightTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,USER_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.userNo,jdbcType=VARCHAR}
-    </foreach>
-    ,MONITOR_USER_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.monitorUserNo,jdbcType=VARCHAR}
-    </foreach>
-    ,WEIGHT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.weight,jdbcType=DECIMAL}
-    </foreach>
-    ,COLLECTION_CODE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.collectionCode,jdbcType=VARCHAR}
-    </foreach>
-    ,CREATE_MAN_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
-    </foreach>
-    ,CREATE_MAN_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
-    </foreach>
-    ,CREATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_MAN_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_MAN_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,DELETE_MAN_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETE_MAN_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,SPOT_TYPE_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.spotTypeNo,jdbcType=VARCHAR}
-    </foreach>
-    ,SPOT_TYPE_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.spotTypeName,jdbcType=VARCHAR}
-    </foreach>
-    ,WEIGHT_ZERO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.weightZero,jdbcType=DECIMAL}
-    </foreach>
-    ,MONITOR_USER_IP=
-    <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
-      when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.monitorUserIp,jdbcType=VARCHAR}
-    </foreach>
-    where SCALE_POINT_NO in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-      #{item.scalePointNo,jdbcType=VARCHAR}
-    </foreach>
+     update METER_BASE_SCALE_POINT
+     set
+       SCALE_POINT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.scalePointNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SCALE_POINT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.scalePointName,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
+       </foreach>
+       ,WEIGH_INSTRUMENT_MODEL=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.weighInstrumentModel,jdbcType=VARCHAR}
+       </foreach>
+       ,WEIGH_INSTRUMENT_PARAM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.weighInstrumentParam,jdbcType=VARCHAR}
+       </foreach>
+       ,MOXA_IP=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.moxaIp,jdbcType=VARCHAR}
+       </foreach>
+       ,MOXA_PORT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.moxaPort,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,LAST_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.lastTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,WEIGHT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.weightTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,USER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.userNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MONITOR_USER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.monitorUserNo,jdbcType=VARCHAR}
+       </foreach>
+       ,WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.weight,jdbcType=DECIMAL}
+       </foreach>
+       ,COLLECTION_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.collectionCode,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,DELETE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,SPOT_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.spotTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SPOT_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.spotTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,WEIGHT_ZERO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.weightZero,jdbcType=DECIMAL}
+       </foreach>
+       ,MONITOR_USER_IP=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.monitorUserIp,jdbcType=VARCHAR}
+       </foreach>
+       ,IS_HELP=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.isHelp,jdbcType=VARCHAR}
+       </foreach>
+       ,IS_TAKE_OVER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.isTakeOver,jdbcType=VARCHAR}
+       </foreach>
+       ,LED_WRITER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.ledWriter,jdbcType=VARCHAR}
+       </foreach>
+       ,RFID_CAR=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.rfidCar,jdbcType=VARCHAR}
+       </foreach>
+       ,PHOTO_CAR=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.photoCar,jdbcType=VARCHAR}
+       </foreach>
+       ,WGT_ERR=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.wgtErr,jdbcType=VARCHAR}
+       </foreach>
+       ,USER_IP=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.userIp,jdbcType=VARCHAR}
+       </foreach>
+     where SCALE_POINT_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.scalePointNo,jdbcType=VARCHAR}
+     </foreach> 
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_BASE_SCALE_POINT
-    where SCALE_POINT_NO in
+    where SCALE_POINT_NO in 
     <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>

src/main/java/com/steerinfo/baseinfo/meterbasescalepoint/model/MeterBaseScalePoint.java

@@ -176,6 +176,48 @@ public class MeterBaseScalePoint implements IBasePO<String> {
     @ApiModelProperty(value="监控用户ip地址(监控界面用)",required=false)
     private String monitorUserIp;
 
+    /**
+     * 0未呼叫，1呼叫待接听，2呼叫已接听(IS_HELP,VARCHAR,1)
+     */
+    @ApiModelProperty(value="0未呼叫，1呼叫待接听，2呼叫已接听",required=false)
+    private String isHelp;
+
+    /**
+     * 0智能终端，1远程计量呼叫(派位阶段)，2远程接管(IS_TAKE_OVER,VARCHAR,1)
+     */
+    @ApiModelProperty(value="0智能终端，1远程计量呼叫(派位阶段)，2远程接管",required=false)
+    private String isTakeOver;
+
+    /**
+     * 写入LED的值(LED_WRITER,VARCHAR,200)
+     */
+    @ApiModelProperty(value="写入LED的值",required=false)
+    private String ledWriter;
+
+    /**
+     * rfid车号(RFID_CAR,VARCHAR,20)
+     */
+    @ApiModelProperty(value="rfid车号",required=false)
+    private String rfidCar;
+
+    /**
+     * 抓拍车号(PHOTO_CAR,VARCHAR,20)
+     */
+    @ApiModelProperty(value="抓拍车号",required=false)
+    private String photoCar;
+
+    /**
+     * 重量异常 0正常 1异常(WGT_ERR,VARCHAR,1)
+     */
+    @ApiModelProperty(value="重量异常 0正常 1异常",required=false)
+    private String wgtErr;
+
+    /**
+     * 接管用户ip地址(接管界面用)(USER_IP,VARCHAR,20)
+     */
+    @ApiModelProperty(value="接管用户ip地址(接管界面用)",required=false)
+    private String userIp;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -412,6 +454,62 @@ public class MeterBaseScalePoint implements IBasePO<String> {
         this.monitorUserIp = monitorUserIp == null ? null : monitorUserIp.trim();
     }
 
+    public String getIsHelp() {
+        return isHelp;
+    }
+
+    public void setIsHelp(String isHelp) {
+        this.isHelp = isHelp == null ? null : isHelp.trim();
+    }
+
+    public String getIsTakeOver() {
+        return isTakeOver;
+    }
+
+    public void setIsTakeOver(String isTakeOver) {
+        this.isTakeOver = isTakeOver == null ? null : isTakeOver.trim();
+    }
+
+    public String getLedWriter() {
+        return ledWriter;
+    }
+
+    public void setLedWriter(String ledWriter) {
+        this.ledWriter = ledWriter == null ? null : ledWriter.trim();
+    }
+
+    public String getRfidCar() {
+        return rfidCar;
+    }
+
+    public void setRfidCar(String rfidCar) {
+        this.rfidCar = rfidCar == null ? null : rfidCar.trim();
+    }
+
+    public String getPhotoCar() {
+        return photoCar;
+    }
+
+    public void setPhotoCar(String photoCar) {
+        this.photoCar = photoCar == null ? null : photoCar.trim();
+    }
+
+    public String getWgtErr() {
+        return wgtErr;
+    }
+
+    public void setWgtErr(String wgtErr) {
+        this.wgtErr = wgtErr == null ? null : wgtErr.trim();
+    }
+
+    public String getUserIp() {
+        return userIp;
+    }
+
+    public void setUserIp(String userIp) {
+        this.userIp = userIp == null ? null : userIp.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -446,6 +544,13 @@ public class MeterBaseScalePoint implements IBasePO<String> {
         sb.append(", spotTypeName=").append(spotTypeName);
         sb.append(", weightZero=").append(weightZero);
         sb.append(", monitorUserIp=").append(monitorUserIp);
+        sb.append(", isHelp=").append(isHelp);
+        sb.append(", isTakeOver=").append(isTakeOver);
+        sb.append(", ledWriter=").append(ledWriter);
+        sb.append(", rfidCar=").append(rfidCar);
+        sb.append(", photoCar=").append(photoCar);
+        sb.append(", wgtErr=").append(wgtErr);
+        sb.append(", userIp=").append(userIp);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/controller/MeterBaseSystemMessageController.java

@@ -0,0 +1,132 @@
+package com.steerinfo.baseinfo.meterbasesystemmessage.controller;
+
+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.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage;
+import com.steerinfo.baseinfo.meterbasesystemmessage.service.IMeterBaseSystemMessageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * MeterBaseSystemMessage RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-02-25 04:07
+ * 类描述
+ * 修订历史：
+ * 日期：2022-02-25
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseSystemMessage RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbasesystemmessages")
+@Api(value = "/${api.version}/meterbasesystemmessages", tags = "通知公告 - MeterBaseSystemMessageController")
+public class MeterBaseSystemMessageController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseSystemMessageService meterBaseSystemMessageService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasesystemmessage:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseSystemMessage> list = meterBaseSystemMessageService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasesystemmessage:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseSystemMessage> list = meterBaseSystemMessageService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasesystemmessage:view")
+    @PostMapping(value = "/like/")
+    public RESTfulResult listLikePost(@RequestBody HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseSystemMessage> list = meterBaseSystemMessageService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseSystemMessage对象创建")
+    @ApiImplicitParam(name = "meterBaseSystemMessage", value = "详细实体meterBaseSystemMessage", required = true, dataType = "MeterBaseSystemMessage")
+    //@RequiresPermissions("meterbasesystemmessage:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody MeterBaseSystemMessage model){
+        try{
+            String msg = meterBaseSystemMessageService.checkandadd(model);
+            if (msg != "" && !msg.equals("")) {
+                return  failed(null,msg);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(null,"操作异常，请确认！");
+        }
+        return success();
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasesystemmessage:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseSystemMessage meterBaseSystemMessage = meterBaseSystemMessageService.getById(id);
+        return success(meterBaseSystemMessage);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseSystemMessage信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseSystemMessage", value = "详细实体meterBaseSystemMessage", required = true, dataType = "MeterBaseSystemMessage")
+    })
+    //@RequiresPermissions("meterbasesystemmessage:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseSystemMessage model){
+        model.setId(id);
+        MeterBaseSystemMessage meterBaseSystemMessage = meterBaseSystemMessageService.modify(model);
+        return success(meterBaseSystemMessage);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasesystemmessage:delete")
+    @DeleteMapping(value = "/{id}")//String
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<String> ids = ListUtils.convertList(list);
+			  meterBaseSystemMessageService.delete(ids);
+    	}
+      return success();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/mapper/MeterBaseSystemMessageMapper.java

@@ -0,0 +1,11 @@
+package com.steerinfo.baseinfo.meterbasesystemmessage.mapper;
+
+import com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterBaseSystemMessageMapper extends IBaseMapper<MeterBaseSystemMessage, String> {
+    String GetNewID();
+}

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/mapper/MeterBaseSystemMessageMapper.xml

@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.baseinfo.meterbasesystemmessage.mapper.MeterBaseSystemMessageMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage">
+    <id column="SYSTEM_MESSAGE_NO" jdbcType="VARCHAR" property="systemMessageNo" />
+    <result column="SYSTEM_MESSAGE_NAME" jdbcType="VARCHAR" property="systemMessageName" />
+    <result column="SYSTEM_MESSAGE_CONTENT" jdbcType="VARCHAR" property="systemMessageContent" />
+    <result column="VAILD_FLAG" jdbcType="VARCHAR" property="vaildFlag" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
+    <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
+    <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
+  </resultMap>
+  <sql id="columns">
+    SYSTEM_MESSAGE_NO, SYSTEM_MESSAGE_NAME, SYSTEM_MESSAGE_CONTENT, VAILD_FLAG, MEMO, 
+    CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+    DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.SYSTEM_MESSAGE_NO, t.SYSTEM_MESSAGE_NAME, t.SYSTEM_MESSAGE_CONTENT, t.VAILD_FLAG, 
+    t.MEMO, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, 
+    t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_SYSTEM_MESSAGE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_SYSTEM_MESSAGE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="systemMessageNo != null and systemMessageNo != ''">
+        and SYSTEM_MESSAGE_NO = #{systemMessageNo}
+      </if>
+      <if test="systemMessageName != null and systemMessageName != ''">
+        and SYSTEM_MESSAGE_NAME = #{systemMessageName}
+      </if>
+      <if test="systemMessageContent != null and systemMessageContent != ''">
+        and SYSTEM_MESSAGE_CONTENT = #{systemMessageContent}
+      </if>
+      <if test="vaildFlag != null and vaildFlag != ''">
+        and VAILD_FLAG = #{vaildFlag}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{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 = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="deleteManNo != null and deleteManNo != ''">
+        and DELETE_MAN_NO = #{deleteManNo}
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        and DELETE_MAN_NAME = #{deleteManName}
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="systemMessageNo != null and systemMessageNo != ''">
+        and SYSTEM_MESSAGE_NO LIKE '%${systemMessageNo}%'
+      </if>
+      <if test="systemMessageName != null and systemMessageName != ''">
+        and SYSTEM_MESSAGE_NAME LIKE '%${systemMessageName}%'
+      </if>
+      <if test="systemMessageContent != null and systemMessageContent != ''">
+        and SYSTEM_MESSAGE_CONTENT LIKE '%${systemMessageContent}%'
+      </if>
+      <if test="vaildFlag != null and vaildFlag != ''">
+        and VAILD_FLAG LIKE '%${vaildFlag}%'
+      </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="deleteManNo != null and deleteManNo != ''">
+        and DELETE_MAN_NO LIKE '%${deleteManNo}%'
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        and DELETE_MAN_NAME LIKE '%${deleteManName}%'
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_SYSTEM_MESSAGE
+    where SYSTEM_MESSAGE_NO = #{systemMessageNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_SYSTEM_MESSAGE
+    where 1!=1 
+      <if test="systemMessageName != null and systemMessageName != ''">
+        or SYSTEM_MESSAGE_NAME = #{systemMessageName}
+      </if>
+      <if test="systemMessageContent != null and systemMessageContent != ''">
+        or SYSTEM_MESSAGE_CONTENT = #{systemMessageContent}
+      </if>
+      <if test="vaildFlag != null and vaildFlag != ''">
+        or VAILD_FLAG = #{vaildFlag}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        or UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        or UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="deleteManNo != null and deleteManNo != ''">
+        or DELETE_MAN_NO = #{deleteManNo}
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        or DELETE_MAN_NAME = #{deleteManName}
+      </if>
+      <if test="deleteTime != null">
+        or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage">
+    insert into METER_BASE_SYSTEM_MESSAGE (SYSTEM_MESSAGE_NO, SYSTEM_MESSAGE_NAME, 
+      SYSTEM_MESSAGE_CONTENT, VAILD_FLAG, MEMO, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
+      )
+    values (#{systemMessageNo,jdbcType=VARCHAR}, #{systemMessageName,jdbcType=VARCHAR}, 
+      #{systemMessageContent,jdbcType=VARCHAR}, #{vaildFlag,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage">
+    insert into METER_BASE_SYSTEM_MESSAGE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="systemMessageNo != null">
+        SYSTEM_MESSAGE_NO,
+      </if>
+      <if test="systemMessageName != null">
+        SYSTEM_MESSAGE_NAME,
+      </if>
+      <if test="systemMessageContent != null">
+        SYSTEM_MESSAGE_CONTENT,
+      </if>
+      <if test="vaildFlag != null">
+        VAILD_FLAG,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="deleteManNo != null">
+        DELETE_MAN_NO,
+      </if>
+      <if test="deleteManName != null">
+        DELETE_MAN_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="systemMessageNo != null">
+        #{systemMessageNo,jdbcType=VARCHAR},
+      </if>
+      <if test="systemMessageName != null">
+        #{systemMessageName,jdbcType=VARCHAR},
+      </if>
+      <if test="systemMessageContent != null">
+        #{systemMessageContent,jdbcType=VARCHAR},
+      </if>
+      <if test="vaildFlag != null">
+        #{vaildFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteManNo != null">
+        #{deleteManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteManName != null">
+        #{deleteManName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage">
+    update METER_BASE_SYSTEM_MESSAGE
+    set SYSTEM_MESSAGE_NAME = #{systemMessageName,jdbcType=VARCHAR},
+      SYSTEM_MESSAGE_CONTENT = #{systemMessageContent,jdbcType=VARCHAR},
+      VAILD_FLAG = #{vaildFlag,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
+      DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
+      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP}
+    where SYSTEM_MESSAGE_NO = #{systemMessageNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage">
+    update METER_BASE_SYSTEM_MESSAGE
+    <set>
+      <if test="systemMessageName != null">
+        SYSTEM_MESSAGE_NAME = #{systemMessageName,jdbcType=VARCHAR},
+      </if>
+      <if test="systemMessageContent != null">
+        SYSTEM_MESSAGE_CONTENT = #{systemMessageContent,jdbcType=VARCHAR},
+      </if>
+      <if test="vaildFlag != null">
+        VAILD_FLAG = #{vaildFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteManNo != null">
+        DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteManName != null">
+        DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where SYSTEM_MESSAGE_NO = #{systemMessageNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where SYSTEM_MESSAGE_NO = #{systemMessageNo,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_BASE_SYSTEM_MESSAGE 
+      (SYSTEM_MESSAGE_NO, 
+      SYSTEM_MESSAGE_NAME, SYSTEM_MESSAGE_CONTENT, 
+      VAILD_FLAG, MEMO, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.systemMessageNo,jdbcType=VARCHAR}, 
+      #{item.systemMessageName,jdbcType=VARCHAR}, #{item.systemMessageContent,jdbcType=VARCHAR}, 
+      #{item.vaildFlag,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, 
+      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_SYSTEM_MESSAGE
+     set
+       SYSTEM_MESSAGE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.systemMessageNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SYSTEM_MESSAGE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.systemMessageName,jdbcType=VARCHAR}
+       </foreach>
+       ,SYSTEM_MESSAGE_CONTENT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.systemMessageContent,jdbcType=VARCHAR}
+       </foreach>
+       ,VAILD_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.vaildFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,DELETE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SYSTEM_MESSAGE_NO" close="end">
+          when #{item.systemMessageNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where SYSTEM_MESSAGE_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.systemMessageNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_SYSTEM_MESSAGE
+    where SYSTEM_MESSAGE_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+
+  <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(SYSTEM_MESSAGE_NO, LENGTH(SYSTEM_MESSAGE_NO) - 4))),0) + 1,5,'0') SYSTEM_MESSAGE_NO
+    FROM METER_BASE_SYSTEM_MESSAGE
+  </select>
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/model/MeterBaseSystemMessage.java

@@ -0,0 +1,242 @@
+package com.steerinfo.baseinfo.meterbasesystemmessage.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value="null")
+public class MeterBaseSystemMessage implements IBasePO<String> {
+    /**
+     * 系统消息编号(SYSTEM_MESSAGE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="系统消息编号",required=true)
+    private String systemMessageNo;
+
+    /**
+     * 公告名称(SYSTEM_MESSAGE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="公告名称",required=false)
+    private String systemMessageName;
+
+    /**
+     * 公告内容(SYSTEM_MESSAGE_CONTENT,VARCHAR,1000)
+     */
+    @ApiModelProperty(value="公告内容",required=false)
+    private String systemMessageContent;
+
+    /**
+     * 状态（1：有效；0：无效）(VAILD_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态（1：有效；0：无效）",required=true)
+    private String vaildFlag;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=true)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人姓名",required=true)
+    private String createManName;
+
+    /**
+     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=true)
+    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;
+
+    /**
+     * 删除人编号(DELETE_MAN_NO,VARCHAR,30)
+     */
+    @ApiModelProperty(value="删除人编号",required=false)
+    private String deleteManNo;
+
+    /**
+     * 删除人姓名(DELETE_MAN_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="删除人姓名",required=false)
+    private String deleteManName;
+
+    /**
+     * 删除时间（YYYY-MM-DD HH:mm:SS）(DELETE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="删除时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date deleteTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.systemMessageNo;
+    }
+
+    @Override
+    public void setId(String systemMessageNo) {
+        this.systemMessageNo = systemMessageNo == null ? null : systemMessageNo.trim();
+    }
+
+    public String getSystemMessageNo() {
+        return systemMessageNo;
+    }
+
+    public void setSystemMessageNo(String systemMessageNo) {
+        this.systemMessageNo = systemMessageNo == null ? null : systemMessageNo.trim();
+    }
+
+    public String getSystemMessageName() {
+        return systemMessageName;
+    }
+
+    public void setSystemMessageName(String systemMessageName) {
+        this.systemMessageName = systemMessageName == null ? null : systemMessageName.trim();
+    }
+
+    public String getSystemMessageContent() {
+        return systemMessageContent;
+    }
+
+    public void setSystemMessageContent(String systemMessageContent) {
+        this.systemMessageContent = systemMessageContent == null ? null : systemMessageContent.trim();
+    }
+
+    public String getVaildFlag() {
+        return vaildFlag;
+    }
+
+    public void setVaildFlag(String vaildFlag) {
+        this.vaildFlag = vaildFlag == null ? null : vaildFlag.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
+    }
+
+    public String getUpdateManName() {
+        return updateManName;
+    }
+
+    public void setUpdateManName(String updateManName) {
+        this.updateManName = updateManName == null ? null : updateManName.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getDeleteManNo() {
+        return deleteManNo;
+    }
+
+    public void setDeleteManNo(String deleteManNo) {
+        this.deleteManNo = deleteManNo == null ? null : deleteManNo.trim();
+    }
+
+    public String getDeleteManName() {
+        return deleteManName;
+    }
+
+    public void setDeleteManName(String deleteManName) {
+        this.deleteManName = deleteManName == null ? null : deleteManName.trim();
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", systemMessageNo=").append(systemMessageNo);
+        sb.append(", systemMessageName=").append(systemMessageName);
+        sb.append(", systemMessageContent=").append(systemMessageContent);
+        sb.append(", vaildFlag=").append(vaildFlag);
+        sb.append(", memo=").append(memo);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateManNo=").append(updateManNo);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", deleteManNo=").append(deleteManNo);
+        sb.append(", deleteManName=").append(deleteManName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/service/IMeterBaseSystemMessageService.java

@@ -0,0 +1,24 @@
+package com.steerinfo.baseinfo.meterbasesystemmessage.service;
+
+import com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect;
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * MeterBaseSystemMessage服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-02-25 04:07
+ * 类描述
+ * 修订历史：
+ * 日期：2022-02-25
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseSystemMessage服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterBaseSystemMessageService extends IBaseService<MeterBaseSystemMessage, String>{
+    String checkandadd(MeterBaseSystemMessage model);
+}

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/service/impl/MeterBaseSystemMessageServiceImpl.java

@@ -0,0 +1,56 @@
+package com.steerinfo.baseinfo.meterbasesystemmessage.service.impl;
+
+import com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage;
+import com.steerinfo.baseinfo.meterbasesystemmessage.mapper.MeterBaseSystemMessageMapper;
+import com.steerinfo.baseinfo.meterbasesystemmessage.service.IMeterBaseSystemMessageService;
+import com.steerinfo.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * MeterBaseSystemMessage服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-02-25 04:07
+ * 类描述
+ * 修订历史：
+ * 日期：2022-02-25
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseSystemMessage服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseSystemMessageService")
+public class MeterBaseSystemMessageServiceImpl extends BaseServiceImpl<MeterBaseSystemMessage, String> implements IMeterBaseSystemMessageService {
+
+    @Autowired
+    private MeterBaseSystemMessageMapper meterBaseSystemMessageMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseSystemMessage, String> getMapper() {
+        return meterBaseSystemMessageMapper;
+    }
+
+    @Override
+    public String checkandadd(MeterBaseSystemMessage model) {
+        if (StringUtils.isEmpty(model.getSystemMessageName())) {
+            return "公告名称不能为空";
+        }
+        if (StringUtils.isEmpty(model.getSystemMessageContent())){
+            return "公告内容不能为空";
+        }
+        String no = meterBaseSystemMessageMapper.GetNewID();
+        model.setSystemMessageNo(new SimpleDateFormat("yyyyMMdd").format(new Date()) + no);
+        model.setCreateTime(new Date());
+        model.setVaildFlag("1");//有效
+        meterBaseSystemMessageMapper.insert(model);
+        return "";
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/controller/MeterBaseTermTareDataController.java

@@ -59,7 +59,7 @@ public class MeterBaseTermTareDataController extends BaseRESTfulController {
             return success(list);
         } catch (Exception ex) {
            ex.printStackTrace();
-throw new MarkerMetException(500, "操作异常！！");
+           throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
@@ -80,6 +80,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("meterbasetermtaredata:view")
+    @PostMapping(value = "/like/")
+    public RESTfulResult listLikePost(@RequestBody HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterBaseTermTareData> list = meterBaseTermTareDataService.queryLikeForPage(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "创建", notes = "根据MeterBaseTermTareData对象创建")
     @ApiImplicitParam(name = "meterBaseTermTareData", value = "详细实体meterBaseTermTareData", required = true, dataType = "MeterBaseTermTareData")
     //@RequiresPermissions("meterbasetermtaredata:create")

src/main/java/com/steerinfo/baseinfo/meterbaseunitdirect/service/impl/MeterBaseUnitDirectServiceImpl.java

@@ -49,12 +49,6 @@ public class MeterBaseUnitDirectServiceImpl extends BaseServiceImpl<MeterBaseUni
         if (StringUtils.isEmpty(model.getUnitType())){
             return "单位类型不能为空";
         }
-        HashMap<String, Object> obj1 = new HashMap<>();
-        obj1.put("carrierUnitName", model.getCarrierUnitName());
-        List<MeterBaseUnitDirect> com1 = meterBaseUnitDirectMapper.selectByParameters(obj1);
-        if (!com1.isEmpty()) {
-            return "该承运单位名称已存在";
-        }
         String no = meterBaseUnitDirectMapper.GetNewID();
         model.setCarrierUnitNo(new SimpleDateFormat("yyyyMMdd").format(new Date()) + no);
         model.setCreateTime(new Date());
@@ -71,16 +65,6 @@ public class MeterBaseUnitDirectServiceImpl extends BaseServiceImpl<MeterBaseUni
         if (StringUtils.isEmpty(model.getUnitType())){
             return "单位类型不能为空";
         }
-        HashMap<String, Object> obj1 = new HashMap<>();
-        obj1.put("carrierUnitName", model.getCarrierUnitName());
-        obj1.put("carrierUnitNo", id);
-        List<MeterBaseUnitDirect> com = meterBaseUnitDirectMapper.selectForUpdate(obj1);
-        if (!com.isEmpty() && com.size() > 1) {
-            return "该承运单位名称已存在！";
-        }
-        if (!com.isEmpty() && com.size() == 1 && !com.get(0).getCarrierUnitNo().equals(id)) {
-            return "该承运单位名称已存在！";
-        }
         model.setUpdateTime(new Date());
         meterBaseUnitDirectMapper.updateByPrimaryKey(model);
         return "";

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -830,7 +830,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
 
     @ApiOperation(value = "车号汇总统计汇总-网页", notes = "根据传入时间和车号，查询给定时间段去重车号")
     @GetMapping(value = "/distinctCarNo")
-    public RESTfulResult distinctCarNo(String carNo, String startTime, String endTime, String dataSource) {
+    public RESTfulResult distinctCarNo(@RequestParam String carNo, String startTime, String endTime, String dataSource) {
         RESTfulResult rm = failed();
         try {
             List<String> rows = meterWorkCarActualFirstService.distinctCarNo(carNo, startTime, endTime, dataSource);

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

@@ -99,7 +99,7 @@ throw new MarkerMetException(500, "操作异常！！");
     })
     //@RequiresPermissions("meterworkrailwayactfirst:view")
     @PostMapping(value = "/like/")
-    public RESTfulResult listLikePost(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+    public RESTfulResult listLikePost(@RequestBody HashMap parmas, Integer pageNum, Integer pageSize) {
         try {
             PageList<MeterWorkRailwayActFirst> list = meterWorkRailwayActFirstService.queryLikeForPage(parmas, pageNum, pageSize);
             return success(list);
@@ -373,7 +373,7 @@ throw new MarkerMetException(500, "操作异常！！");
 
     @ApiOperation(value = "火车号汇总统计汇总-网页", notes = "根据传入时间和火车号，查询给定时间段去重车号")
     @GetMapping(value = "/distinctCarNo")
-    public RESTfulResult distinctCarNo(String railwayTypeNo,String railwayNo, String startTime, String endTime, String dataSource,String valueFlag) {
+    public RESTfulResult distinctCarNo(@RequestParam String railwayTypeNo,String railwayNo, String startTime, String endTime, String dataSource,String valueFlag) {
         RESTfulResult rm = failed();
         try {
             List<String> rows = meterWorkRailwayActFirstService.distinctCarNo(railwayTypeNo,railwayNo, startTime, endTime, dataSource,valueFlag);

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

@@ -419,6 +419,9 @@
       <if test="trainNumberNo != null and trainNumberNo != ''">
         and TRAIN_NUMBER_NO = #{trainNumberNo}
       </if>
+      <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')
+      </if>
     </where>
   </sql>
   <sql id="whereLike">

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/controller/MeterWorkRailwayActualController.java

@@ -83,7 +83,7 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
     })
     //@RequiresPermissions("meterworkrailwayactual:view")
     @PostMapping(value = "/like/")
-    public RESTfulResult listLikePost(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+    public RESTfulResult listLikePost(@RequestBody HashMap parmas, Integer pageNum, Integer pageSize) {
         try {
             PageList<MeterWorkRailwayActual> list = meterWorkRailwayActualService.queryLikeForPage(parmas, pageNum, pageSize);
             return success(list);