Explorar el Código

1.动态秤
2.jisco相关类
2.毛皮类型预处理

BourneCao hace 4 años
padre
commit
05af4faebe
Se han modificado 58 ficheros con 7575 adiciones y 219 borrados
  1. 146 0
      src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/controller/DynamicBaseBatchdbConfigController.java
  2. 12 0
      src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/mapper/DynamicBaseBatchdbConfigMapper.java
  3. 406 0
      src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/mapper/DynamicBaseBatchdbConfigMapper.xml
  4. 212 0
      src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/model/DynamicBaseBatchdbConfig.java
  5. 23 0
      src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/service/IDynamicBaseBatchdbConfigService.java
  6. 38 0
      src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/service/impl/DynamicBaseBatchdbConfigServiceImpl.java
  7. 137 0
      src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/controller/DynamicBaseBatchStationController.java
  8. 9 0
      src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/mapper/DynamicBaseBatchStationMapper.java
  9. 419 0
      src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/mapper/DynamicBaseBatchStationMapper.xml
  10. 228 0
      src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/model/DynamicBaseBatchStation.java
  11. 21 0
      src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/service/IDynamicBaseBatchStationService.java
  12. 34 0
      src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/service/impl/DynamicBaseBatchStationServiceImpl.java
  13. 137 0
      src/main/java/com/jisco/dynamicweight/dynamicbasemeterial/controller/DynamicBaseMeterialController.java
  14. 9 0
      src/main/java/com/jisco/dynamicweight/dynamicbasemeterial/mapper/DynamicBaseMeterialMapper.java
  15. 395 0
      src/main/java/com/jisco/dynamicweight/dynamicbasemeterial/mapper/DynamicBaseMeterialMapper.xml
  16. 213 0
      src/main/java/com/jisco/dynamicweight/dynamicbasemeterial/model/DynamicBaseMeterial.java
  17. 21 0
      src/main/java/com/jisco/dynamicweight/dynamicbasemeterial/service/IDynamicBaseMeterialService.java
  18. 34 0
      src/main/java/com/jisco/dynamicweight/dynamicbasemeterial/service/impl/DynamicBaseMeterialServiceImpl.java
  19. 140 0
      src/main/java/com/jisco/dynamicweight/dynamicbasereciever/controller/DynamicBaseRecieverController.java
  20. 9 0
      src/main/java/com/jisco/dynamicweight/dynamicbasereciever/mapper/DynamicBaseRecieverMapper.java
  21. 419 0
      src/main/java/com/jisco/dynamicweight/dynamicbasereciever/mapper/DynamicBaseRecieverMapper.xml
  22. 228 0
      src/main/java/com/jisco/dynamicweight/dynamicbasereciever/model/DynamicBaseReciever.java
  23. 21 0
      src/main/java/com/jisco/dynamicweight/dynamicbasereciever/service/IDynamicBaseRecieverService.java
  24. 34 0
      src/main/java/com/jisco/dynamicweight/dynamicbasereciever/service/impl/DynamicBaseRecieverServiceImpl.java
  25. 141 0
      src/main/java/com/jisco/dynamicweight/dynamicbasescdbconfig/controller/DynamicBaseScdbConfigController.java
  26. 9 0
      src/main/java/com/jisco/dynamicweight/dynamicbasescdbconfig/mapper/DynamicBaseScdbConfigMapper.java
  27. 443 0
      src/main/java/com/jisco/dynamicweight/dynamicbasescdbconfig/mapper/DynamicBaseScdbConfigMapper.xml
  28. 243 0
      src/main/java/com/jisco/dynamicweight/dynamicbasescdbconfig/model/DynamicBaseScdbConfig.java
  29. 21 0
      src/main/java/com/jisco/dynamicweight/dynamicbasescdbconfig/service/IDynamicBaseScdbConfigService.java
  30. 34 0
      src/main/java/com/jisco/dynamicweight/dynamicbasescdbconfig/service/impl/DynamicBaseScdbConfigServiceImpl.java
  31. 149 0
      src/main/java/com/jisco/dynamicweight/dynamicbasescstation/controller/DynamicBaseScStationController.java
  32. 9 0
      src/main/java/com/jisco/dynamicweight/dynamicbasescstation/mapper/DynamicBaseScStationMapper.java
  33. 573 0
      src/main/java/com/jisco/dynamicweight/dynamicbasescstation/mapper/DynamicBaseScStationMapper.xml
  34. 318 0
      src/main/java/com/jisco/dynamicweight/dynamicbasescstation/model/DynamicBaseScStation.java
  35. 21 0
      src/main/java/com/jisco/dynamicweight/dynamicbasescstation/service/IDynamicBaseScStationService.java
  36. 34 0
      src/main/java/com/jisco/dynamicweight/dynamicbasescstation/service/impl/DynamicBaseScStationServiceImpl.java
  37. 138 0
      src/main/java/com/jisco/dynamicweight/dynamicbasesender/controller/DynamicBaseSenderController.java
  38. 10 0
      src/main/java/com/jisco/dynamicweight/dynamicbasesender/mapper/DynamicBaseSenderMapper.java
  39. 419 0
      src/main/java/com/jisco/dynamicweight/dynamicbasesender/mapper/DynamicBaseSenderMapper.xml
  40. 227 0
      src/main/java/com/jisco/dynamicweight/dynamicbasesender/model/DynamicBaseSender.java
  41. 23 0
      src/main/java/com/jisco/dynamicweight/dynamicbasesender/service/IDynamicBaseSenderService.java
  42. 36 0
      src/main/java/com/jisco/dynamicweight/dynamicbasesender/service/impl/DynamicBaseSenderServiceImpl.java
  43. 139 0
      src/main/java/com/jisco/dynamicweight/dynamicbasestationmaterial/controller/DynamicBaseStationMaterialController.java
  44. 9 0
      src/main/java/com/jisco/dynamicweight/dynamicbasestationmaterial/mapper/DynamicBaseStationMaterialMapper.java
  45. 420 0
      src/main/java/com/jisco/dynamicweight/dynamicbasestationmaterial/mapper/DynamicBaseStationMaterialMapper.xml
  46. 228 0
      src/main/java/com/jisco/dynamicweight/dynamicbasestationmaterial/model/DynamicBaseStationMaterial.java
  47. 21 0
      src/main/java/com/jisco/dynamicweight/dynamicbasestationmaterial/service/IDynamicBaseStationMaterialService.java
  48. 34 0
      src/main/java/com/jisco/dynamicweight/dynamicbasestationmaterial/service/impl/DynamicBaseStationMaterialServiceImpl.java
  49. 44 0
      src/main/java/com/jisco/dynamicweight/util/ExcelUtil.java
  50. 18 0
      src/main/java/com/jisco/dynamicweight/util/UserUtil.java
  51. 1 2
      src/main/java/com/steerinfo/SysManageApplication.java
  52. 20 2
      src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/controller/MeterBaseCarBlacelistController.java
  53. 324 198
      src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/mapper/MeterBaseCarBlacelistMapper.xml
  54. 75 0
      src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/model/MeterBaseCarBlacelist.java
  55. 2 0
      src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/service/IMeterBaseCarBlacelistService.java
  56. 30 4
      src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/service/impl/MeterBaseCarBlacelistServiceImpl.java
  57. 13 13
      src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java
  58. 4 0
      src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

+ 146 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/controller/DynamicBaseBatchdbConfigController.java

@@ -0,0 +1,146 @@
+package com.jisco.dynamicweight.dynamicbasebatchdbconfig.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig;
+import com.jisco.dynamicweight.dynamicbasebatchdbconfig.service.IDynamicBaseBatchdbConfigService;
+import com.jisco.dynamicweight.util.ExcelUtil;
+import com.jisco.dynamicweight.util.UserUtil;
+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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * DynamicBaseBatchdbConfig RESTful接口:
+ *
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-24 08:42
+ * 类描述
+ * 修订历史:
+ * 日期:2021-12-24
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseBatchdbConfig RESTful接口
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
+ */
+@RestController
+@RequestMapping("/${api.version}/dynamicbasebatchdbconfigs")
+public class DynamicBaseBatchdbConfigController extends BaseRESTfulController {
+
+    @Autowired
+    IDynamicBaseBatchdbConfigService dynamicBaseBatchdbConfigService;
+
+    @ApiOperation(value = "获取列表", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("dynamicbasebatchdbconfig:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        PageList<DynamicBaseBatchdbConfig> list = dynamicBaseBatchdbConfigService.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("dynamicbasebatchdbconfig:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        PageList<DynamicBaseBatchdbConfig> list = dynamicBaseBatchdbConfigService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value = "创建", notes = "根据DynamicBaseBatchdbConfig对象创建")
+    @ApiImplicitParam(name = "dynamicBaseBatchdbConfig", value = "详细实体dynamicBaseBatchdbConfig", required = true, dataType = "DynamicBaseBatchdbConfig")
+    //@RequiresPermissions("dynamicbasebatchdbconfig:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody DynamicBaseBatchdbConfig model) {
+        checkAdd(model);
+        model.setValidFlag("0");
+        model.setCreateManNo(UserUtil.getCurrentUserId());
+        model.setCreateManName(UserUtil.getCurrentUserName());
+        model.setCreateTime(new Date());
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseBatchdbConfig dynamicBaseBatchdbConfig = dynamicBaseBatchdbConfigService.add(model);
+        return success(dynamicBaseBatchdbConfig);
+    }
+
+    private void checkAdd(DynamicBaseBatchdbConfig model) {
+        Assert.isTrue(StringUtils.isNotBlank(model.getName()), "名称不能为空");
+        Assert.isTrue(StringUtils.isNotBlank(model.getUrl()), "URL不能为空");
+        Assert.isTrue(StringUtils.isNotBlank(model.getTableName()), "表名不能为空");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getCreateManNo()), "创建人不能为空");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getCreateManName()), "创建人名称不能为空");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getValidFlag()), "有效标识不能为空");
+    }
+
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasebatchdbconfig:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id) {
+        DynamicBaseBatchdbConfig dynamicBaseBatchdbConfig = dynamicBaseBatchdbConfigService.getById(id);
+        return success(dynamicBaseBatchdbConfig);
+    }
+
+    @ApiOperation(value = "更新详细信息", notes = "根据url的id来指定更新对象,并根据传过来的dynamicBaseBatchdbConfig信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "dynamicBaseBatchdbConfig", value = "详细实体dynamicBaseBatchdbConfig", required = true, dataType = "DynamicBaseBatchdbConfig")
+    })
+    //@RequiresPermissions("dynamicbasebatchdbconfig:update")
+    @PutMapping(value = "/{id}", produces = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody DynamicBaseBatchdbConfig model) {
+        model.setId(id);
+        checkUpdate(model);
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseBatchdbConfig dynamicBaseBatchdbConfig = dynamicBaseBatchdbConfigService.modify(model);
+        return success(dynamicBaseBatchdbConfig);
+    }
+
+    private void checkUpdate(DynamicBaseBatchdbConfig model) {
+        checkAdd(model);
+//        Assert.isTrue(StringUtils.isNotBlank(model.getUpdateManNo()), "修改人不能为空");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getUpdateManName()), "修改人名称不能为空");
+    }
+
+    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasebatchdbconfig: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);
+            dynamicBaseBatchdbConfigService.delete(ids);
+        }
+        return success();
+    }
+
+    @ApiOperation(value = "导出Excel", notes = "导出Excel")
+    @GetMapping(value = "/exportExcel")//String
+    public void exportExcel(HttpServletResponse response) throws IOException {
+        List<DynamicBaseBatchdbConfig> list = dynamicBaseBatchdbConfigService.query(null);
+        ExcelUtil.exportExcel(response, list, DynamicBaseBatchdbConfig.class, "皮带秤扩展配置");
+    }
+
+}

+ 12 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/mapper/DynamicBaseBatchdbConfigMapper.java

@@ -0,0 +1,12 @@
+package com.jisco.dynamicweight.dynamicbasebatchdbconfig.mapper;
+
+import com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DynamicBaseBatchdbConfigMapper extends IBaseMapper<DynamicBaseBatchdbConfig, String> {
+}

+ 406 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/mapper/DynamicBaseBatchdbConfigMapper.xml

@@ -0,0 +1,406 @@
+<?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.jisco.dynamicweight.dynamicbasebatchdbconfig.mapper.DynamicBaseBatchdbConfigMapper">
+    <resultMap id="BaseResultMap"
+               type="com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig">
+        <id column="CONFIG_NO" jdbcType="VARCHAR" property="configNo"/>
+        <result column="NAME" jdbcType="VARCHAR" property="name"/>
+        <result column="URL" jdbcType="VARCHAR" property="url"/>
+        <result column="TABLE_NAME" jdbcType="VARCHAR" property="tableName"/>
+        <result column="MEMO" jdbcType="VARCHAR" property="memo"/>
+        <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag"/>
+        <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"/>
+    </resultMap>
+    <sql id="columns">
+        CONFIG_NO
+        , NAME, URL, TABLE_NAME, MEMO, VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME,
+    CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+    </sql>
+    <sql id="columns_alias">
+        t
+        .
+        CONFIG_NO
+        , t.NAME, t.URL, t.TABLE_NAME, t.MEMO, t.VALID_FLAG, t.CREATE_MAN_NO,
+    t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM DYNAMIC_BASE_BATCHDB_CONFIG
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM DYNAMIC_BASE_BATCHDB_CONFIG t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="configNo != null and configNo != ''">
+                and CONFIG_NO = #{configNo}
+            </if>
+            <if test="name != null and name != ''">
+                and NAME = #{name}
+            </if>
+            <if test="url != null and url != ''">
+                and URL = #{url}
+            </if>
+            <if test="tableName != null and tableName != ''">
+                and TABLE_NAME = #{tableName}
+            </if>
+            <if test="memo != null and memo != ''">
+                and MEMO = #{memo}
+            </if>
+            <if test="validFlag != null and validFlag != ''">
+                and VALID_FLAG = #{validFlag}
+            </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>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="configNo != null and configNo != ''">
+                and CONFIG_NO LIKE '%${configNo}%'
+            </if>
+            <if test="name != null and name != ''">
+                and NAME LIKE '%${name}%'
+            </if>
+            <if test="url != null and url != ''">
+                and URL LIKE '%${url}%'
+            </if>
+            <if test="tableName != null and tableName != ''">
+                and TABLE_NAME LIKE '%${tableName}%'
+            </if>
+            <if test="memo != null and memo != ''">
+                and MEMO LIKE '%${memo}%'
+            </if>
+            <if test="validFlag != null and validFlag != ''">
+                and VALID_FLAG LIKE '%${validFlag}%'
+            </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>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+        delete
+        from DYNAMIC_BASE_BATCHDB_CONFIG
+        where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from DYNAMIC_BASE_BATCHDB_CONFIG
+        where 1!=1
+        <if test="name != null and name != ''">
+            or NAME = #{name}
+        </if>
+        <if test="url != null and url != ''">
+            or URL = #{url}
+        </if>
+        <if test="tableName != null and tableName != ''">
+            or TABLE_NAME = #{tableName}
+        </if>
+        <if test="memo != null and memo != ''">
+            or MEMO = #{memo}
+        </if>
+        <if test="validFlag != null and validFlag != ''">
+            or VALID_FLAG = #{validFlag}
+        </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>
+    </delete>
+    <insert id="insert" parameterType="com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig">
+        insert into DYNAMIC_BASE_BATCHDB_CONFIG (CONFIG_NO, NAME, URL,
+                                                 TABLE_NAME, MEMO, VALID_FLAG,
+                                                 CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
+                                                 UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME)
+        values (#{configNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR},
+                #{tableName,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR},
+                #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+                #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
+    </insert>
+    <insert id="insertSelective"
+            parameterType="com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig">
+        insert into DYNAMIC_BASE_BATCHDB_CONFIG
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="configNo != null">
+                CONFIG_NO,
+            </if>
+            <if test="name != null">
+                NAME,
+            </if>
+            <if test="url != null">
+                URL,
+            </if>
+            <if test="tableName != null">
+                TABLE_NAME,
+            </if>
+            <if test="memo != null">
+                MEMO,
+            </if>
+            <if test="validFlag != null">
+                VALID_FLAG,
+            </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>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="configNo != null">
+                #{configNo,jdbcType=VARCHAR},
+            </if>
+            <if test="name != null">
+                #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="url != null">
+                #{url,jdbcType=VARCHAR},
+            </if>
+            <if test="tableName != null">
+                #{tableName,jdbcType=VARCHAR},
+            </if>
+            <if test="memo != null">
+                #{memo,jdbcType=VARCHAR},
+            </if>
+            <if test="validFlag != null">
+                #{validFlag,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>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey"
+            parameterType="com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig">
+        update DYNAMIC_BASE_BATCHDB_CONFIG
+        set NAME            = #{name,jdbcType=VARCHAR},
+            URL             = #{url,jdbcType=VARCHAR},
+            TABLE_NAME      = #{tableName,jdbcType=VARCHAR},
+            MEMO            = #{memo,jdbcType=VARCHAR},
+            VALID_FLAG      = #{validFlag,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}
+        where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
+    </update>
+    <update id="updateByPrimaryKeySelective"
+            parameterType="com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig">
+        update DYNAMIC_BASE_BATCHDB_CONFIG
+        <set>
+            <if test="name != null">
+                NAME = #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="url != null">
+                URL = #{url,jdbcType=VARCHAR},
+            </if>
+            <if test="tableName != null">
+                TABLE_NAME = #{tableName,jdbcType=VARCHAR},
+            </if>
+            <if test="memo != null">
+                MEMO = #{memo,jdbcType=VARCHAR},
+            </if>
+            <if test="validFlag != null">
+                VALID_FLAG = #{validFlag,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>
+        </set>
+        where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where CONFIG_NO = #{configNo,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 DYNAMIC_BASE_BATCHDB_CONFIG
+        (CONFIG_NO,
+        NAME, URL, TABLE_NAME,
+        MEMO, VALID_FLAG, CREATE_MAN_NO,
+        CREATE_MAN_NAME, CREATE_TIME,
+        UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+        )
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.configNo,jdbcType=VARCHAR},
+        #{item.name,jdbcType=VARCHAR}, #{item.url,jdbcType=VARCHAR}, #{item.tableName,jdbcType=VARCHAR},
+        #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,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}
+        from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update DYNAMIC_BASE_BATCHDB_CONFIG
+        set
+        CONFIG_NO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+            when #{item.configNo,jdbcType=VARCHAR} then #{item.configNo,jdbcType=VARCHAR}
+        </foreach>
+        ,NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+            when #{item.configNo,jdbcType=VARCHAR} then #{item.name,jdbcType=VARCHAR}
+        </foreach>
+        ,URL=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+            when #{item.configNo,jdbcType=VARCHAR} then #{item.url,jdbcType=VARCHAR}
+        </foreach>
+        ,TABLE_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+            when #{item.configNo,jdbcType=VARCHAR} then #{item.tableName,jdbcType=VARCHAR}
+        </foreach>
+        ,MEMO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+            when #{item.configNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+        </foreach>
+        ,VALID_FLAG=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+            when #{item.configNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+        </foreach>
+        ,CREATE_MAN_NO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+            when #{item.configNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+        </foreach>
+        ,CREATE_MAN_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+            when #{item.configNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+        </foreach>
+        ,CREATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+            when #{item.configNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_MAN_NO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+            when #{item.configNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_MAN_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+            when #{item.configNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+            when #{item.configNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        where CONFIG_NO in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.configNo,jdbcType=VARCHAR}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from DYNAMIC_BASE_BATCHDB_CONFIG
+        where CONFIG_NO in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示!!!-->
+    <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+
+</mapper>

+ 212 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/model/DynamicBaseBatchdbConfig.java

@@ -0,0 +1,212 @@
+package com.jisco.dynamicweight.dynamicbasebatchdbconfig.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 DynamicBaseBatchdbConfig implements IBasePO<String> {
+    /**
+     * 分料数据库编号(雪花ID)(CONFIG_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="分料数据库编号(雪花ID)",required=true)
+    private String configNo;
+
+    /**
+     * 名称(NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="名称",required=true)
+    private String name;
+
+    /**
+     * 路径(URL,VARCHAR,200)
+     */
+    @ApiModelProperty(value="路径",required=true)
+    private String url;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="表名",required=true)
+    private String tableName;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 状态(0:无效;1:有效)(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0:无效;1:有效)",required=true)
+    private String validFlag;
+
+    /**
+     * 创建人编号(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;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.configNo;
+    }
+
+    @Override
+    public void setId(String configNo) {
+        this.configNo = configNo == null ? null : configNo.trim();
+    }
+
+    public String getConfigNo() {
+        return configNo;
+    }
+
+    public void setConfigNo(String configNo) {
+        this.configNo = configNo == null ? null : configNo.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url == null ? null : url.trim();
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", configNo=").append(configNo);
+        sb.append(", name=").append(name);
+        sb.append(", url=").append(url);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", memo=").append(memo);
+        sb.append(", validFlag=").append(validFlag);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 23 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/service/IDynamicBaseBatchdbConfigService.java

@@ -0,0 +1,23 @@
+package com.jisco.dynamicweight.dynamicbasebatchdbconfig.service;
+
+import com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig;
+import com.steerinfo.framework.service.IBaseService;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * DynamicBaseBatchdbConfig服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-24 08:42
+ * 类描述
+ * 修订历史:
+ * 日期:2021-12-24
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseBatchdbConfig服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IDynamicBaseBatchdbConfigService extends IBaseService<DynamicBaseBatchdbConfig, String>{
+}

+ 38 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/service/impl/DynamicBaseBatchdbConfigServiceImpl.java

@@ -0,0 +1,38 @@
+package com.jisco.dynamicweight.dynamicbasebatchdbconfig.service.impl;
+
+import com.jisco.dynamicweight.dynamicbasebatchdbconfig.mapper.DynamicBaseBatchdbConfigMapper;
+import com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.jisco.dynamicweight.dynamicbasebatchdbconfig.service.IDynamicBaseBatchdbConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * DynamicBaseBatchdbConfig服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-24 08:42
+ * 类描述
+ * 修订历史:
+ * 日期:2021-12-24
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseBatchdbConfig服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "dynamicBaseBatchdbConfigService")
+public class DynamicBaseBatchdbConfigServiceImpl extends BaseServiceImpl<DynamicBaseBatchdbConfig, String> implements IDynamicBaseBatchdbConfigService {
+
+    @Autowired
+    private DynamicBaseBatchdbConfigMapper dynamicBaseBatchdbConfigMapper;
+
+    @Override
+    protected IBaseMapper<DynamicBaseBatchdbConfig, String> getMapper() {
+        return dynamicBaseBatchdbConfigMapper;
+    }
+
+}

+ 137 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/controller/DynamicBaseBatchStationController.java

@@ -0,0 +1,137 @@
+package com.jisco.dynamicweight.dynamicbasebatchstation.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation;
+import com.jisco.dynamicweight.dynamicbasebatchstation.service.IDynamicBaseBatchStationService;
+import com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever;
+import com.jisco.dynamicweight.util.ExcelUtil;
+import com.jisco.dynamicweight.util.UserUtil;
+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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * DynamicBaseBatchStation RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-05 11:28
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-05
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseBatchStation RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/dynamicbasebatchstations")
+public class DynamicBaseBatchStationController extends BaseRESTfulController {
+
+    @Autowired
+    IDynamicBaseBatchStationService dynamicBaseBatchStationService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("dynamicbasebatchstation:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicBaseBatchStation> list = dynamicBaseBatchStationService.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("dynamicbasebatchstation:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicBaseBatchStation> list = dynamicBaseBatchStationService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据DynamicBaseBatchStation对象创建")
+    @ApiImplicitParam(name = "dynamicBaseBatchStation", value = "详细实体dynamicBaseBatchStation", required = true, dataType = "DynamicBaseBatchStation")
+    //@RequiresPermissions("dynamicbasebatchstation:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody DynamicBaseBatchStation model){
+        Assert.isTrue(StringUtils.isNotBlank(model.getStationName()), "请输入皮带秤名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getStationCode()), "请输入皮带秤编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getPikaCode()), "请输入PIKA系统编码!");
+        model.setValidFlag("0");
+        model.setCreateManNo(UserUtil.getCurrentUserId());
+        model.setCreateManName(UserUtil.getCurrentUserName());
+        model.setCreateTime(new Date());
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseBatchStation dynamicBaseBatchStation = dynamicBaseBatchStationService.add(model);
+        return success(dynamicBaseBatchStation);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasebatchstation:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        DynamicBaseBatchStation dynamicBaseBatchStation = dynamicBaseBatchStationService.getById(id);
+        return success(dynamicBaseBatchStation);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的dynamicBaseBatchStation信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "dynamicBaseBatchStation", value = "详细实体dynamicBaseBatchStation", required = true, dataType = "DynamicBaseBatchStation")
+    })
+    //@RequiresPermissions("dynamicbasebatchstation:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody DynamicBaseBatchStation model){
+        Assert.isTrue(StringUtils.isNotBlank(model.getStationName()), "请输入皮带秤名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getStationCode()), "请输入皮带秤编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getPikaCode()), "请输入PIKA系统编码!");
+        model.setId(id);
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseBatchStation dynamicBaseBatchStation = dynamicBaseBatchStationService.modify(model);
+        return success(dynamicBaseBatchStation);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasebatchstation: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);
+			  dynamicBaseBatchStationService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value = "导出Excel", notes = "导出Excel")
+    @GetMapping(value = "/exportExcel")//String
+    public void exportExcel(HttpServletResponse response) throws IOException {
+        List<DynamicBaseBatchStation> list = dynamicBaseBatchStationService.query(null);
+        ExcelUtil.exportExcel(response, list, DynamicBaseBatchStation.class, "分料系统站点信息");
+    }
+}

+ 9 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/mapper/DynamicBaseBatchStationMapper.java

@@ -0,0 +1,9 @@
+package com.jisco.dynamicweight.dynamicbasebatchstation.mapper;
+
+import com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DynamicBaseBatchStationMapper extends IBaseMapper<DynamicBaseBatchStation, String> {
+}

+ 419 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/mapper/DynamicBaseBatchStationMapper.xml

@@ -0,0 +1,419 @@
+<?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.jisco.dynamicweight.dynamicbasebatchstation.mapper.DynamicBaseBatchStationMapper">
+  <resultMap id="BaseResultMap" type="com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation">
+    <id column="STATION_NO" jdbcType="VARCHAR" property="stationNo" />
+    <result column="STATION_NAME" jdbcType="VARCHAR" property="stationName" />
+    <result column="STATION_CODE" jdbcType="VARCHAR" property="stationCode" />
+    <result column="PIKA_CODE" jdbcType="VARCHAR" property="pikaCode" />
+    <result column="SENDER_CODE" jdbcType="VARCHAR" property="senderCode" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <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" />
+  </resultMap>
+  <sql id="columns">
+    STATION_NO, STATION_NAME, STATION_CODE, PIKA_CODE, SENDER_CODE, MEMO, VALID_FLAG, 
+    CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.STATION_NO, t.STATION_NAME, t.STATION_CODE, t.PIKA_CODE, t.SENDER_CODE, t.MEMO, 
+    t.VALID_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, 
+    t.UPDATE_MAN_NAME, t.UPDATE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM DYNAMIC_BASE_BATCH_STATION
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DYNAMIC_BASE_BATCH_STATION t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="stationNo != null and stationNo != ''">
+        and STATION_NO = #{stationNo}
+      </if>
+      <if test="stationName != null and stationName != ''">
+        and STATION_NAME = #{stationName}
+      </if>
+      <if test="stationCode != null and stationCode != ''">
+        and STATION_CODE = #{stationCode}
+      </if>
+      <if test="pikaCode != null and pikaCode != ''">
+        and PIKA_CODE = #{pikaCode}
+      </if>
+      <if test="senderCode != null and senderCode != ''">
+        and SENDER_CODE = #{senderCode}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="stationNo != null and stationNo != ''">
+        and STATION_NO LIKE '%${stationNo}%'
+      </if>
+      <if test="stationName != null and stationName != ''">
+        and STATION_NAME LIKE '%${stationName}%'
+      </if>
+      <if test="stationCode != null and stationCode != ''">
+        and STATION_CODE LIKE '%${stationCode}%'
+      </if>
+      <if test="pikaCode != null and pikaCode != ''">
+        and PIKA_CODE LIKE '%${pikaCode}%'
+      </if>
+      <if test="senderCode != null and senderCode != ''">
+        and SENDER_CODE LIKE '%${senderCode}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from DYNAMIC_BASE_BATCH_STATION
+    where STATION_NO = #{stationNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DYNAMIC_BASE_BATCH_STATION
+    where 1!=1 
+      <if test="stationName != null and stationName != ''">
+        or STATION_NAME = #{stationName}
+      </if>
+      <if test="stationCode != null and stationCode != ''">
+        or STATION_CODE = #{stationCode}
+      </if>
+      <if test="pikaCode != null and pikaCode != ''">
+        or PIKA_CODE = #{pikaCode}
+      </if>
+      <if test="senderCode != null and senderCode != ''">
+        or SENDER_CODE = #{senderCode}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation">
+    insert into DYNAMIC_BASE_BATCH_STATION (STATION_NO, STATION_NAME, STATION_CODE, 
+      PIKA_CODE, SENDER_CODE, MEMO, 
+      VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME)
+    values (#{stationNo,jdbcType=VARCHAR}, #{stationName,jdbcType=VARCHAR}, #{stationCode,jdbcType=VARCHAR}, 
+      #{pikaCode,jdbcType=VARCHAR}, #{senderCode,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
+      #{validFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation">
+    insert into DYNAMIC_BASE_BATCH_STATION
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="stationNo != null">
+        STATION_NO,
+      </if>
+      <if test="stationName != null">
+        STATION_NAME,
+      </if>
+      <if test="stationCode != null">
+        STATION_CODE,
+      </if>
+      <if test="pikaCode != null">
+        PIKA_CODE,
+      </if>
+      <if test="senderCode != null">
+        SENDER_CODE,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="stationNo != null">
+        #{stationNo,jdbcType=VARCHAR},
+      </if>
+      <if test="stationName != null">
+        #{stationName,jdbcType=VARCHAR},
+      </if>
+      <if test="stationCode != null">
+        #{stationCode,jdbcType=VARCHAR},
+      </if>
+      <if test="pikaCode != null">
+        #{pikaCode,jdbcType=VARCHAR},
+      </if>
+      <if test="senderCode != null">
+        #{senderCode,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation">
+    update DYNAMIC_BASE_BATCH_STATION
+    set STATION_NAME = #{stationName,jdbcType=VARCHAR},
+      STATION_CODE = #{stationCode,jdbcType=VARCHAR},
+      PIKA_CODE = #{pikaCode,jdbcType=VARCHAR},
+      SENDER_CODE = #{senderCode,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,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}
+    where STATION_NO = #{stationNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation">
+    update DYNAMIC_BASE_BATCH_STATION
+    <set>
+      <if test="stationName != null">
+        STATION_NAME = #{stationName,jdbcType=VARCHAR},
+      </if>
+      <if test="stationCode != null">
+        STATION_CODE = #{stationCode,jdbcType=VARCHAR},
+      </if>
+      <if test="pikaCode != null">
+        PIKA_CODE = #{pikaCode,jdbcType=VARCHAR},
+      </if>
+      <if test="senderCode != null">
+        SENDER_CODE = #{senderCode,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,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>
+    </set>
+    where STATION_NO = #{stationNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where STATION_NO = #{stationNo,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 DYNAMIC_BASE_BATCH_STATION 
+      (STATION_NO, 
+      STATION_NAME, STATION_CODE, PIKA_CODE, 
+      SENDER_CODE, MEMO, VALID_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.stationNo,jdbcType=VARCHAR}, 
+      #{item.stationName,jdbcType=VARCHAR}, #{item.stationCode,jdbcType=VARCHAR}, #{item.pikaCode,jdbcType=VARCHAR}, 
+      #{item.senderCode,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,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}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update DYNAMIC_BASE_BATCH_STATION
+     set
+       STATION_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.stationNo,jdbcType=VARCHAR}
+       </foreach>
+       ,STATION_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.stationName,jdbcType=VARCHAR}
+       </foreach>
+       ,STATION_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.stationCode,jdbcType=VARCHAR}
+       </foreach>
+       ,PIKA_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.pikaCode,jdbcType=VARCHAR}
+       </foreach>
+       ,SENDER_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.senderCode,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where STATION_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.stationNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DYNAMIC_BASE_BATCH_STATION
+    where STATION_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 228 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/model/DynamicBaseBatchStation.java

@@ -0,0 +1,228 @@
+package com.jisco.dynamicweight.dynamicbasebatchstation.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 DynamicBaseBatchStation implements IBasePO<String> {
+    /**
+     * 站点编号(雪花ID)(STATION_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="站点编号(雪花ID)",required=true)
+    private String stationNo;
+
+    /**
+     * 站点名称(STATION_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="站点名称",required=true)
+    private String stationName;
+
+    /**
+     * 站点编码(STATION_CODE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="站点编码",required=true)
+    private String stationCode;
+
+    /**
+     * PIKA系统编码(PIKA_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="PIKA系统编码",required=true)
+    private String pikaCode;
+
+    /**
+     * 发货库房编码(SENDER_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="发货库房编码",required=false)
+    private String senderCode;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 状态(0:无效;1:有效)(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0:无效;1:有效)",required=true)
+    private String validFlag;
+
+    /**
+     * 创建人编号(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;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.stationNo;
+    }
+
+    @Override
+    public void setId(String stationNo) {
+        this.stationNo = stationNo == null ? null : stationNo.trim();
+    }
+
+    public String getStationNo() {
+        return stationNo;
+    }
+
+    public void setStationNo(String stationNo) {
+        this.stationNo = stationNo == null ? null : stationNo.trim();
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName == null ? null : stationName.trim();
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode == null ? null : stationCode.trim();
+    }
+
+    public String getPikaCode() {
+        return pikaCode;
+    }
+
+    public void setPikaCode(String pikaCode) {
+        this.pikaCode = pikaCode == null ? null : pikaCode.trim();
+    }
+
+    public String getSenderCode() {
+        return senderCode;
+    }
+
+    public void setSenderCode(String senderCode) {
+        this.senderCode = senderCode == null ? null : senderCode.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", stationNo=").append(stationNo);
+        sb.append(", stationName=").append(stationName);
+        sb.append(", stationCode=").append(stationCode);
+        sb.append(", pikaCode=").append(pikaCode);
+        sb.append(", senderCode=").append(senderCode);
+        sb.append(", memo=").append(memo);
+        sb.append(", validFlag=").append(validFlag);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 21 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/service/IDynamicBaseBatchStationService.java

@@ -0,0 +1,21 @@
+package com.jisco.dynamicweight.dynamicbasebatchstation.service;
+
+import com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation;
+import com.steerinfo.framework.service.IBaseService;
+
+/**
+ * DynamicBaseBatchStation服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-05 11:28
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-05
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseBatchStation服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IDynamicBaseBatchStationService extends IBaseService<DynamicBaseBatchStation, String>{
+
+}

+ 34 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/service/impl/DynamicBaseBatchStationServiceImpl.java

@@ -0,0 +1,34 @@
+package com.jisco.dynamicweight.dynamicbasebatchstation.service.impl;
+
+import com.jisco.dynamicweight.dynamicbasebatchstation.mapper.DynamicBaseBatchStationMapper;
+import com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation;
+import com.jisco.dynamicweight.dynamicbasebatchstation.service.IDynamicBaseBatchStationService;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * DynamicBaseBatchStation服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-05 11:28
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-05
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseBatchStation服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "dynamicBaseBatchStationService")
+public class DynamicBaseBatchStationServiceImpl extends BaseServiceImpl<DynamicBaseBatchStation, String> implements IDynamicBaseBatchStationService {
+
+    @Autowired
+    private DynamicBaseBatchStationMapper dynamicBaseBatchStationMapper;
+
+    @Override
+    protected IBaseMapper<DynamicBaseBatchStation, String> getMapper() {
+        return dynamicBaseBatchStationMapper;
+    }
+}

+ 137 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasemeterial/controller/DynamicBaseMeterialController.java

@@ -0,0 +1,137 @@
+package com.jisco.dynamicweight.dynamicbasemeterial.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.jisco.dynamicweight.dynamicbasemeterial.model.DynamicBaseMeterial;
+import com.jisco.dynamicweight.dynamicbasemeterial.service.IDynamicBaseMeterialService;
+import com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation;
+import com.jisco.dynamicweight.util.ExcelUtil;
+import com.jisco.dynamicweight.util.UserUtil;
+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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * DynamicBaseMeterial RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-06 10:10
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-06
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseMeterial RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/dynamicbasemeterials")
+public class DynamicBaseMeterialController extends BaseRESTfulController {
+
+    @Autowired
+    IDynamicBaseMeterialService dynamicBaseMeterialService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("dynamicbasemeterial:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicBaseMeterial> list = dynamicBaseMeterialService.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("dynamicbasemeterial:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicBaseMeterial> list = dynamicBaseMeterialService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据DynamicBaseMeterial对象创建")
+    @ApiImplicitParam(name = "dynamicBaseMeterial", value = "详细实体dynamicBaseMeterial", required = true, dataType = "DynamicBaseMeterial")
+    //@RequiresPermissions("dynamicbasemeterial:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody DynamicBaseMeterial model){
+        Assert.isTrue(StringUtils.isNotBlank(model.getMeterialName()), "请输入物料名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getMeterialCode()), "请输入物料编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getPikaMeterialName()), "请输入皮卡系统物料名称!");
+        model.setValidFlag("0");
+        model.setCreateManNo(UserUtil.getCurrentUserId());
+        model.setCreateManName(UserUtil.getCurrentUserName());
+        model.setCreateTime(new Date());
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseMeterial dynamicBaseMeterial = dynamicBaseMeterialService.add(model);
+        return success(dynamicBaseMeterial);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasemeterial:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        DynamicBaseMeterial dynamicBaseMeterial = dynamicBaseMeterialService.getById(id);
+        return success(dynamicBaseMeterial);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的dynamicBaseMeterial信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "dynamicBaseMeterial", value = "详细实体dynamicBaseMeterial", required = true, dataType = "DynamicBaseMeterial")
+    })
+    //@RequiresPermissions("dynamicbasemeterial:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody DynamicBaseMeterial model){
+        Assert.isTrue(StringUtils.isNotBlank(model.getMeterialName()), "请输入物料名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getMeterialCode()), "请输入物料编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getPikaMeterialName()), "请输入皮卡系统物料名称!");
+        model.setId(id);
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseMeterial dynamicBaseMeterial = dynamicBaseMeterialService.modify(model);
+        return success(dynamicBaseMeterial);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasemeterial: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);
+			  dynamicBaseMeterialService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value = "导出Excel", notes = "导出Excel")
+    @GetMapping(value = "/exportExcel")//String
+    public void exportExcel(HttpServletResponse response) throws IOException {
+        List<DynamicBaseMeterial> list = dynamicBaseMeterialService.query(null);
+        ExcelUtil.exportExcel(response, list, DynamicBaseMeterial.class, "动态秤物料信息");
+    }
+}

+ 9 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasemeterial/mapper/DynamicBaseMeterialMapper.java

@@ -0,0 +1,9 @@
+package com.jisco.dynamicweight.dynamicbasemeterial.mapper;
+
+import com.jisco.dynamicweight.dynamicbasemeterial.model.DynamicBaseMeterial;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DynamicBaseMeterialMapper extends IBaseMapper<DynamicBaseMeterial, String> {
+}

+ 395 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasemeterial/mapper/DynamicBaseMeterialMapper.xml

@@ -0,0 +1,395 @@
+<?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.jisco.dynamicweight.dynamicbasemeterial.mapper.DynamicBaseMeterialMapper">
+  <resultMap id="BaseResultMap" type="com.jisco.dynamicweight.dynamicbasemeterial.model.DynamicBaseMeterial">
+    <id column="METERIAL_NO" jdbcType="VARCHAR" property="meterialNo" />
+    <result column="METERIAL_NAME" jdbcType="VARCHAR" property="meterialName" />
+    <result column="METERIAL_CODE" jdbcType="VARCHAR" property="meterialCode" />
+    <result column="PIKA_METERIAL_NAME" jdbcType="VARCHAR" property="pikaMeterialName" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <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" />
+  </resultMap>
+  <sql id="columns">
+    METERIAL_NO, METERIAL_NAME, METERIAL_CODE, PIKA_METERIAL_NAME, MEMO, VALID_FLAG, 
+    CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.METERIAL_NO, t.METERIAL_NAME, t.METERIAL_CODE, t.PIKA_METERIAL_NAME, t.MEMO, t.VALID_FLAG, 
+    t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, 
+    t.UPDATE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM DYNAMIC_BASE_METERIAL
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DYNAMIC_BASE_METERIAL t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="meterialNo != null and meterialNo != ''">
+        and METERIAL_NO = #{meterialNo}
+      </if>
+      <if test="meterialName != null and meterialName != ''">
+        and METERIAL_NAME = #{meterialName}
+      </if>
+      <if test="meterialCode != null and meterialCode != ''">
+        and METERIAL_CODE = #{meterialCode}
+      </if>
+      <if test="pikaMeterialName != null and pikaMeterialName != ''">
+        and PIKA_METERIAL_NAME = #{pikaMeterialName}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="meterialNo != null and meterialNo != ''">
+        and METERIAL_NO LIKE '%${meterialNo}%'
+      </if>
+      <if test="meterialName != null and meterialName != ''">
+        and METERIAL_NAME LIKE '%${meterialName}%'
+      </if>
+      <if test="meterialCode != null and meterialCode != ''">
+        and METERIAL_CODE LIKE '%${meterialCode}%'
+      </if>
+      <if test="pikaMeterialName != null and pikaMeterialName != ''">
+        and PIKA_METERIAL_NAME LIKE '%${pikaMeterialName}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from DYNAMIC_BASE_METERIAL
+    where METERIAL_NO = #{meterialNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DYNAMIC_BASE_METERIAL
+    where 1!=1 
+      <if test="meterialName != null and meterialName != ''">
+        or METERIAL_NAME = #{meterialName}
+      </if>
+      <if test="meterialCode != null and meterialCode != ''">
+        or METERIAL_CODE = #{meterialCode}
+      </if>
+      <if test="pikaMeterialName != null and pikaMeterialName != ''">
+        or PIKA_METERIAL_NAME = #{pikaMeterialName}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.jisco.dynamicweight.dynamicbasemeterial.model.DynamicBaseMeterial">
+    insert into DYNAMIC_BASE_METERIAL (METERIAL_NO, METERIAL_NAME, METERIAL_CODE, 
+      PIKA_METERIAL_NAME, MEMO, VALID_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+      )
+    values (#{meterialNo,jdbcType=VARCHAR}, #{meterialName,jdbcType=VARCHAR}, #{meterialCode,jdbcType=VARCHAR}, 
+      #{pikaMeterialName,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.jisco.dynamicweight.dynamicbasemeterial.model.DynamicBaseMeterial">
+    insert into DYNAMIC_BASE_METERIAL
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="meterialNo != null">
+        METERIAL_NO,
+      </if>
+      <if test="meterialName != null">
+        METERIAL_NAME,
+      </if>
+      <if test="meterialCode != null">
+        METERIAL_CODE,
+      </if>
+      <if test="pikaMeterialName != null">
+        PIKA_METERIAL_NAME,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="meterialNo != null">
+        #{meterialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="meterialName != null">
+        #{meterialName,jdbcType=VARCHAR},
+      </if>
+      <if test="meterialCode != null">
+        #{meterialCode,jdbcType=VARCHAR},
+      </if>
+      <if test="pikaMeterialName != null">
+        #{pikaMeterialName,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.jisco.dynamicweight.dynamicbasemeterial.model.DynamicBaseMeterial">
+    update DYNAMIC_BASE_METERIAL
+    set METERIAL_NAME = #{meterialName,jdbcType=VARCHAR},
+      METERIAL_CODE = #{meterialCode,jdbcType=VARCHAR},
+      PIKA_METERIAL_NAME = #{pikaMeterialName,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,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}
+    where METERIAL_NO = #{meterialNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.jisco.dynamicweight.dynamicbasemeterial.model.DynamicBaseMeterial">
+    update DYNAMIC_BASE_METERIAL
+    <set>
+      <if test="meterialName != null">
+        METERIAL_NAME = #{meterialName,jdbcType=VARCHAR},
+      </if>
+      <if test="meterialCode != null">
+        METERIAL_CODE = #{meterialCode,jdbcType=VARCHAR},
+      </if>
+      <if test="pikaMeterialName != null">
+        PIKA_METERIAL_NAME = #{pikaMeterialName,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,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>
+    </set>
+    where METERIAL_NO = #{meterialNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where METERIAL_NO = #{meterialNo,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 DYNAMIC_BASE_METERIAL 
+      (METERIAL_NO, 
+      METERIAL_NAME, METERIAL_CODE, PIKA_METERIAL_NAME, 
+      MEMO, VALID_FLAG, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.meterialNo,jdbcType=VARCHAR}, 
+      #{item.meterialName,jdbcType=VARCHAR}, #{item.meterialCode,jdbcType=VARCHAR}, #{item.pikaMeterialName,jdbcType=VARCHAR}, 
+      #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,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}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update DYNAMIC_BASE_METERIAL
+     set
+       METERIAL_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METERIAL_NO" close="end">
+          when #{item.meterialNo,jdbcType=VARCHAR} then #{item.meterialNo,jdbcType=VARCHAR}
+       </foreach>
+       ,METERIAL_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METERIAL_NO" close="end">
+          when #{item.meterialNo,jdbcType=VARCHAR} then #{item.meterialName,jdbcType=VARCHAR}
+       </foreach>
+       ,METERIAL_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METERIAL_NO" close="end">
+          when #{item.meterialNo,jdbcType=VARCHAR} then #{item.meterialCode,jdbcType=VARCHAR}
+       </foreach>
+       ,PIKA_METERIAL_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METERIAL_NO" close="end">
+          when #{item.meterialNo,jdbcType=VARCHAR} then #{item.pikaMeterialName,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METERIAL_NO" close="end">
+          when #{item.meterialNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METERIAL_NO" close="end">
+          when #{item.meterialNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METERIAL_NO" close="end">
+          when #{item.meterialNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METERIAL_NO" close="end">
+          when #{item.meterialNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METERIAL_NO" close="end">
+          when #{item.meterialNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METERIAL_NO" close="end">
+          when #{item.meterialNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METERIAL_NO" close="end">
+          when #{item.meterialNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case METERIAL_NO" close="end">
+          when #{item.meterialNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where METERIAL_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.meterialNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DYNAMIC_BASE_METERIAL
+    where METERIAL_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 213 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasemeterial/model/DynamicBaseMeterial.java

@@ -0,0 +1,213 @@
+package com.jisco.dynamicweight.dynamicbasemeterial.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+@ApiModel(value="动态秤物料表")
+public class DynamicBaseMeterial implements IBasePO<String> {
+    /**
+     * ID(METERIAL_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="ID",required=true)
+    private String meterialNo;
+
+    /**
+     * 物料名称(METERIAL_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="物料名称",required=false)
+    private String meterialName;
+
+    /**
+     * 物料编码(METERIAL_CODE,VARCHAR,60)
+     */
+    @ApiModelProperty(value="物料编码",required=false)
+    private String meterialCode;
+
+    /**
+     * PIKA物料名称(PIKA_METERIAL_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="PIKA物料名称",required=false)
+    private String pikaMeterialName;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 状态(0:无效;1:有效)(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0:无效;1:有效)",required=false)
+    private String validFlag;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人姓名",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(YYYY-MM-DD HH:mm:SS)(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间(YYYY-MM-DD HH:mm:SS)",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间(YYYY-MM-DD HH:mm:SS)(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间(YYYY-MM-DD HH:mm:SS)",required=false)
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.meterialNo;
+    }
+
+    @Override
+    public void setId(String meterialNo) {
+        this.meterialNo = meterialNo == null ? null : meterialNo.trim();
+    }
+
+    public String getMeterialNo() {
+        return meterialNo;
+    }
+
+    public void setMeterialNo(String meterialNo) {
+        this.meterialNo = meterialNo == null ? null : meterialNo.trim();
+    }
+
+    public String getMeterialName() {
+        return meterialName;
+    }
+
+    public void setMeterialName(String meterialName) {
+        this.meterialName = meterialName == null ? null : meterialName.trim();
+    }
+
+    public String getMeterialCode() {
+        return meterialCode;
+    }
+
+    public void setMeterialCode(String meterialCode) {
+        this.meterialCode = meterialCode == null ? null : meterialCode.trim();
+    }
+
+    public String getPikaMeterialName() {
+        return pikaMeterialName;
+    }
+
+    public void setPikaMeterialName(String pikaMeterialName) {
+        this.pikaMeterialName = pikaMeterialName == null ? null : pikaMeterialName.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", meterialNo=").append(meterialNo);
+        sb.append(", meterialName=").append(meterialName);
+        sb.append(", meterialCode=").append(meterialCode);
+        sb.append(", pikaMeterialName=").append(pikaMeterialName);
+        sb.append(", memo=").append(memo);
+        sb.append(", validFlag=").append(validFlag);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 21 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasemeterial/service/IDynamicBaseMeterialService.java

@@ -0,0 +1,21 @@
+package com.jisco.dynamicweight.dynamicbasemeterial.service;
+
+import com.jisco.dynamicweight.dynamicbasemeterial.model.DynamicBaseMeterial;
+import com.steerinfo.framework.service.IBaseService;
+
+/**
+ * DynamicBaseMeterial服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-06 10:10
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-06
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseMeterial服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IDynamicBaseMeterialService extends IBaseService<DynamicBaseMeterial, String>{
+
+}

+ 34 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasemeterial/service/impl/DynamicBaseMeterialServiceImpl.java

@@ -0,0 +1,34 @@
+package com.jisco.dynamicweight.dynamicbasemeterial.service.impl;
+
+import com.jisco.dynamicweight.dynamicbasemeterial.mapper.DynamicBaseMeterialMapper;
+import com.jisco.dynamicweight.dynamicbasemeterial.model.DynamicBaseMeterial;
+import com.jisco.dynamicweight.dynamicbasemeterial.service.IDynamicBaseMeterialService;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * DynamicBaseMeterial服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-06 10:10
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-06
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseMeterial服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "dynamicBaseMeterialService")
+public class DynamicBaseMeterialServiceImpl extends BaseServiceImpl<DynamicBaseMeterial, String> implements IDynamicBaseMeterialService {
+
+    @Autowired
+    private DynamicBaseMeterialMapper dynamicBaseMeterialMapper;
+
+    @Override
+    protected IBaseMapper<DynamicBaseMeterial, String> getMapper() {
+        return dynamicBaseMeterialMapper;
+    }
+}

+ 140 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasereciever/controller/DynamicBaseRecieverController.java

@@ -0,0 +1,140 @@
+package com.jisco.dynamicweight.dynamicbasereciever.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig;
+import com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever;
+import com.jisco.dynamicweight.dynamicbasereciever.service.IDynamicBaseRecieverService;
+import com.jisco.dynamicweight.util.ExcelUtil;
+import com.jisco.dynamicweight.util.UserUtil;
+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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * DynamicBaseReciever RESTful接口:
+ *
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-31 02:55
+ * 类描述
+ * 修订历史:
+ * 日期:2021-12-31
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseReciever RESTful接口
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
+ */
+@RestController
+@RequestMapping("/${api.version}/dynamicbaserecievers")
+public class DynamicBaseRecieverController extends BaseRESTfulController {
+
+    @Autowired
+    IDynamicBaseRecieverService dynamicBaseRecieverService;
+
+    @ApiOperation(value = "获取列表", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("dynamicbasereciever:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        PageList<DynamicBaseReciever> list = dynamicBaseRecieverService.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("dynamicbasereciever:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        PageList<DynamicBaseReciever> list = dynamicBaseRecieverService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value = "创建", notes = "根据DynamicBaseReciever对象创建")
+    @ApiImplicitParam(name = "dynamicBaseReciever", value = "详细实体dynamicBaseReciever", required = true, dataType = "DynamicBaseReciever")
+    //@RequiresPermissions("dynamicbasereciever:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody DynamicBaseReciever model) {
+        Assert.isTrue(StringUtils.isNotBlank(model.getReceiverName()), "请输入PIKA系统收货单位名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getReceiverCode()), "请输入PIKA系统收货单位编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getReceiverType()), "请输入PIKA系统收货点类型!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getDisSysName()), "请输入分料系统收货单位名称!");
+        model.setValidFlag("0");
+        model.setCreateManNo(UserUtil.getCurrentUserId());
+        model.setCreateManName(UserUtil.getCurrentUserName());
+        model.setCreateTime(new Date());
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseReciever dynamicBaseReciever = dynamicBaseRecieverService.add(model);
+        return success(dynamicBaseReciever);
+    }
+
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasereciever:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id) {
+        DynamicBaseReciever dynamicBaseReciever = dynamicBaseRecieverService.getById(id);
+        return success(dynamicBaseReciever);
+    }
+
+    @ApiOperation(value = "更新详细信息", notes = "根据url的id来指定更新对象,并根据传过来的dynamicBaseReciever信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "dynamicBaseReciever", value = "详细实体dynamicBaseReciever", required = true, dataType = "DynamicBaseReciever")
+    })
+    //@RequiresPermissions("dynamicbasereciever:update")
+    @PutMapping(value = "/{id}", produces = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody DynamicBaseReciever model) {
+        Assert.isTrue(StringUtils.isNotBlank(model.getReceiverName()), "请输入PIKA系统收货单位名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getReceiverCode()), "请输入PIKA系统收货单位编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getReceiverType()), "请输入PIKA系统收货点类型!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getDisSysName()), "请输入分料系统收货单位名称!");
+        model.setId(id);
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseReciever dynamicBaseReciever = dynamicBaseRecieverService.modify(model);
+        return success(dynamicBaseReciever);
+    }
+
+    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasereciever: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);
+            dynamicBaseRecieverService.delete(ids);
+        }
+        return success();
+    }
+
+    @ApiOperation(value = "导出Excel", notes = "导出Excel")
+    @GetMapping(value = "/exportExcel")//String
+    public void exportExcel(HttpServletResponse response) throws IOException {
+        List<DynamicBaseReciever> list = dynamicBaseRecieverService.query(null);
+        ExcelUtil.exportExcel(response, list, DynamicBaseReciever.class, "收货单位信息");
+    }
+}

+ 9 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasereciever/mapper/DynamicBaseRecieverMapper.java

@@ -0,0 +1,9 @@
+package com.jisco.dynamicweight.dynamicbasereciever.mapper;
+
+import com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DynamicBaseRecieverMapper extends IBaseMapper<DynamicBaseReciever, String> {
+}

+ 419 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasereciever/mapper/DynamicBaseRecieverMapper.xml

@@ -0,0 +1,419 @@
+<?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.jisco.dynamicweight.dynamicbasereciever.mapper.DynamicBaseRecieverMapper">
+  <resultMap id="BaseResultMap" type="com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever">
+    <id column="RECEIVER_NO" jdbcType="VARCHAR" property="receiverNo" />
+    <result column="RECEIVER_NAME" jdbcType="VARCHAR" property="receiverName" />
+    <result column="RECEIVER_CODE" jdbcType="VARCHAR" property="receiverCode" />
+    <result column="DIS_SYS_NAME" jdbcType="VARCHAR" property="disSysName" />
+    <result column="RECEIVER_TYPE" jdbcType="VARCHAR" property="receiverType" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <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" />
+  </resultMap>
+  <sql id="columns">
+    RECEIVER_NO, RECEIVER_NAME, RECEIVER_CODE, DIS_SYS_NAME, RECEIVER_TYPE, MEMO, VALID_FLAG, 
+    CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.RECEIVER_NO, t.RECEIVER_NAME, t.RECEIVER_CODE, t.DIS_SYS_NAME, t.RECEIVER_TYPE, 
+    t.MEMO, t.VALID_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, 
+    t.UPDATE_MAN_NAME, t.UPDATE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM DYNAMIC_BASE_RECIEVER
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DYNAMIC_BASE_RECIEVER t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="receiverNo != null and receiverNo != ''">
+        and RECEIVER_NO = #{receiverNo}
+      </if>
+      <if test="receiverName != null and receiverName != ''">
+        and RECEIVER_NAME = #{receiverName}
+      </if>
+      <if test="receiverCode != null and receiverCode != ''">
+        and RECEIVER_CODE = #{receiverCode}
+      </if>
+      <if test="disSysName != null and disSysName != ''">
+        and DIS_SYS_NAME = #{disSysName}
+      </if>
+      <if test="receiverType != null and receiverType != ''">
+        and RECEIVER_TYPE = #{receiverType}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="receiverNo != null and receiverNo != ''">
+        and RECEIVER_NO LIKE '%${receiverNo}%'
+      </if>
+      <if test="receiverName != null and receiverName != ''">
+        and RECEIVER_NAME LIKE '%${receiverName}%'
+      </if>
+      <if test="receiverCode != null and receiverCode != ''">
+        and RECEIVER_CODE LIKE '%${receiverCode}%'
+      </if>
+      <if test="disSysName != null and disSysName != ''">
+        and DIS_SYS_NAME LIKE '%${disSysName}%'
+      </if>
+      <if test="receiverType != null and receiverType != ''">
+        and RECEIVER_TYPE LIKE '%${receiverType}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from DYNAMIC_BASE_RECIEVER
+    where RECEIVER_NO = #{receiverNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DYNAMIC_BASE_RECIEVER
+    where 1!=1 
+      <if test="receiverName != null and receiverName != ''">
+        or RECEIVER_NAME = #{receiverName}
+      </if>
+      <if test="receiverCode != null and receiverCode != ''">
+        or RECEIVER_CODE = #{receiverCode}
+      </if>
+      <if test="disSysName != null and disSysName != ''">
+        or DIS_SYS_NAME = #{disSysName}
+      </if>
+      <if test="receiverType != null and receiverType != ''">
+        or RECEIVER_TYPE = #{receiverType}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever">
+    insert into DYNAMIC_BASE_RECIEVER (RECEIVER_NO, RECEIVER_NAME, RECEIVER_CODE, 
+      DIS_SYS_NAME, RECEIVER_TYPE, MEMO, 
+      VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME)
+    values (#{receiverNo,jdbcType=VARCHAR}, #{receiverName,jdbcType=VARCHAR}, #{receiverCode,jdbcType=VARCHAR}, 
+      #{disSysName,jdbcType=VARCHAR}, #{receiverType,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
+      #{validFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever">
+    insert into DYNAMIC_BASE_RECIEVER
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="receiverNo != null">
+        RECEIVER_NO,
+      </if>
+      <if test="receiverName != null">
+        RECEIVER_NAME,
+      </if>
+      <if test="receiverCode != null">
+        RECEIVER_CODE,
+      </if>
+      <if test="disSysName != null">
+        DIS_SYS_NAME,
+      </if>
+      <if test="receiverType != null">
+        RECEIVER_TYPE,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="receiverNo != null">
+        #{receiverNo,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverName != null">
+        #{receiverName,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverCode != null">
+        #{receiverCode,jdbcType=VARCHAR},
+      </if>
+      <if test="disSysName != null">
+        #{disSysName,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverType != null">
+        #{receiverType,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever">
+    update DYNAMIC_BASE_RECIEVER
+    set RECEIVER_NAME = #{receiverName,jdbcType=VARCHAR},
+      RECEIVER_CODE = #{receiverCode,jdbcType=VARCHAR},
+      DIS_SYS_NAME = #{disSysName,jdbcType=VARCHAR},
+      RECEIVER_TYPE = #{receiverType,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,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}
+    where RECEIVER_NO = #{receiverNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever">
+    update DYNAMIC_BASE_RECIEVER
+    <set>
+      <if test="receiverName != null">
+        RECEIVER_NAME = #{receiverName,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverCode != null">
+        RECEIVER_CODE = #{receiverCode,jdbcType=VARCHAR},
+      </if>
+      <if test="disSysName != null">
+        DIS_SYS_NAME = #{disSysName,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverType != null">
+        RECEIVER_TYPE = #{receiverType,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,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>
+    </set>
+    where RECEIVER_NO = #{receiverNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where RECEIVER_NO = #{receiverNo,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 DYNAMIC_BASE_RECIEVER 
+      (RECEIVER_NO, 
+      RECEIVER_NAME, RECEIVER_CODE, DIS_SYS_NAME, 
+      RECEIVER_TYPE, MEMO, VALID_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.receiverNo,jdbcType=VARCHAR}, 
+      #{item.receiverName,jdbcType=VARCHAR}, #{item.receiverCode,jdbcType=VARCHAR}, #{item.disSysName,jdbcType=VARCHAR}, 
+      #{item.receiverType,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,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}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update DYNAMIC_BASE_RECIEVER
+     set
+       RECEIVER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RECEIVER_NO" close="end">
+          when #{item.receiverNo,jdbcType=VARCHAR} then #{item.receiverNo,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RECEIVER_NO" close="end">
+          when #{item.receiverNo,jdbcType=VARCHAR} then #{item.receiverName,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVER_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RECEIVER_NO" close="end">
+          when #{item.receiverNo,jdbcType=VARCHAR} then #{item.receiverCode,jdbcType=VARCHAR}
+       </foreach>
+       ,DIS_SYS_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RECEIVER_NO" close="end">
+          when #{item.receiverNo,jdbcType=VARCHAR} then #{item.disSysName,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVER_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RECEIVER_NO" close="end">
+          when #{item.receiverNo,jdbcType=VARCHAR} then #{item.receiverType,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RECEIVER_NO" close="end">
+          when #{item.receiverNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RECEIVER_NO" close="end">
+          when #{item.receiverNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RECEIVER_NO" close="end">
+          when #{item.receiverNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RECEIVER_NO" close="end">
+          when #{item.receiverNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RECEIVER_NO" close="end">
+          when #{item.receiverNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RECEIVER_NO" close="end">
+          when #{item.receiverNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RECEIVER_NO" close="end">
+          when #{item.receiverNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RECEIVER_NO" close="end">
+          when #{item.receiverNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where RECEIVER_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.receiverNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DYNAMIC_BASE_RECIEVER
+    where RECEIVER_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 228 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasereciever/model/DynamicBaseReciever.java

@@ -0,0 +1,228 @@
+package com.jisco.dynamicweight.dynamicbasereciever.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 DynamicBaseReciever implements IBasePO<String> {
+    /**
+     * 收货单位编号(雪花ID)(RECEIVER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="收货单位编号(雪花ID)",required=true)
+    private String receiverNo;
+
+    /**
+     * 收货单位名称(RECEIVER_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="收货单位名称",required=true)
+    private String receiverName;
+
+    /**
+     * 收货单位编码(RECEIVER_CODE,VARCHAR,60)
+     */
+    @ApiModelProperty(value="收货单位编码",required=true)
+    private String receiverCode;
+
+    /**
+     * 分料系统编码(DIS_SYS_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="分料系统编码",required=true)
+    private String disSysName;
+
+    /**
+     * 收货点类型(RECEIVER_TYPE,VARCHAR,60)
+     */
+    @ApiModelProperty(value="收货点类型",required=true)
+    private String receiverType;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 状态(0:无效;1:有效)(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0:无效;1:有效)",required=true)
+    private String validFlag;
+
+    /**
+     * 创建人编号(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;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.receiverNo;
+    }
+
+    @Override
+    public void setId(String receiverNo) {
+        this.receiverNo = receiverNo == null ? null : receiverNo.trim();
+    }
+
+    public String getReceiverNo() {
+        return receiverNo;
+    }
+
+    public void setReceiverNo(String receiverNo) {
+        this.receiverNo = receiverNo == null ? null : receiverNo.trim();
+    }
+
+    public String getReceiverName() {
+        return receiverName;
+    }
+
+    public void setReceiverName(String receiverName) {
+        this.receiverName = receiverName == null ? null : receiverName.trim();
+    }
+
+    public String getReceiverCode() {
+        return receiverCode;
+    }
+
+    public void setReceiverCode(String receiverCode) {
+        this.receiverCode = receiverCode == null ? null : receiverCode.trim();
+    }
+
+    public String getDisSysName() {
+        return disSysName;
+    }
+
+    public void setDisSysName(String disSysName) {
+        this.disSysName = disSysName == null ? null : disSysName.trim();
+    }
+
+    public String getReceiverType() {
+        return receiverType;
+    }
+
+    public void setReceiverType(String receiverType) {
+        this.receiverType = receiverType == null ? null : receiverType.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", receiverNo=").append(receiverNo);
+        sb.append(", receiverName=").append(receiverName);
+        sb.append(", receiverCode=").append(receiverCode);
+        sb.append(", disSysName=").append(disSysName);
+        sb.append(", receiverType=").append(receiverType);
+        sb.append(", memo=").append(memo);
+        sb.append(", validFlag=").append(validFlag);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 21 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasereciever/service/IDynamicBaseRecieverService.java

@@ -0,0 +1,21 @@
+package com.jisco.dynamicweight.dynamicbasereciever.service;
+
+import com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever;
+import com.steerinfo.framework.service.IBaseService;
+
+/**
+ * DynamicBaseReciever服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-31 02:55
+ * 类描述
+ * 修订历史:
+ * 日期:2021-12-31
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseReciever服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IDynamicBaseRecieverService extends IBaseService<DynamicBaseReciever, String>{
+
+}

+ 34 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasereciever/service/impl/DynamicBaseRecieverServiceImpl.java

@@ -0,0 +1,34 @@
+package com.jisco.dynamicweight.dynamicbasereciever.service.impl;
+
+import com.jisco.dynamicweight.dynamicbasereciever.mapper.DynamicBaseRecieverMapper;
+import com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever;
+import com.jisco.dynamicweight.dynamicbasereciever.service.IDynamicBaseRecieverService;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * DynamicBaseReciever服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-31 02:55
+ * 类描述
+ * 修订历史:
+ * 日期:2021-12-31
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseReciever服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "dynamicBaseRecieverService")
+public class DynamicBaseRecieverServiceImpl extends BaseServiceImpl<DynamicBaseReciever, String> implements IDynamicBaseRecieverService {
+
+    @Autowired
+    private DynamicBaseRecieverMapper dynamicBaseRecieverMapper;
+
+    @Override
+    protected IBaseMapper<DynamicBaseReciever, String> getMapper() {
+        return dynamicBaseRecieverMapper;
+    }
+}

+ 141 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasescdbconfig/controller/DynamicBaseScdbConfigController.java

@@ -0,0 +1,141 @@
+package com.jisco.dynamicweight.dynamicbasescdbconfig.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.jisco.dynamicweight.dynamicbasemeterial.model.DynamicBaseMeterial;
+import com.jisco.dynamicweight.dynamicbasescdbconfig.model.DynamicBaseScdbConfig;
+import com.jisco.dynamicweight.dynamicbasescdbconfig.service.IDynamicBaseScdbConfigService;
+import com.jisco.dynamicweight.util.ExcelUtil;
+import com.jisco.dynamicweight.util.UserUtil;
+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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * DynamicBaseScdbConfig RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-06 05:25
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-06
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseScdbConfig RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/dynamicbasescdbconfigs")
+public class DynamicBaseScdbConfigController extends BaseRESTfulController {
+
+    @Autowired
+    IDynamicBaseScdbConfigService dynamicBaseScdbConfigService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("dynamicbasescdbconfig:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicBaseScdbConfig> list = dynamicBaseScdbConfigService.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("dynamicbasescdbconfig:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicBaseScdbConfig> list = dynamicBaseScdbConfigService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据DynamicBaseScdbConfig对象创建")
+    @ApiImplicitParam(name = "dynamicBaseScdbConfig", value = "详细实体dynamicBaseScdbConfig", required = true, dataType = "DynamicBaseScdbConfig")
+    //@RequiresPermissions("dynamicbasescdbconfig:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody DynamicBaseScdbConfig model){
+        Assert.isTrue(StringUtils.isNotBlank(model.getName()), "请输入名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getUrl()), "请输入连接字符串!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getUsername()), "请输入用户名!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getPassword()), "请输入密码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getTableName()), "请输入表名!");
+        model.setValidFlag("0");
+        model.setCreateManNo(UserUtil.getCurrentUserId());
+        model.setCreateManName(UserUtil.getCurrentUserName());
+        model.setCreateTime(new Date());
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseScdbConfig dynamicBaseScdbConfig = dynamicBaseScdbConfigService.add(model);
+        return success(dynamicBaseScdbConfig);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasescdbconfig:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        DynamicBaseScdbConfig dynamicBaseScdbConfig = dynamicBaseScdbConfigService.getById(id);
+        return success(dynamicBaseScdbConfig);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的dynamicBaseScdbConfig信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "dynamicBaseScdbConfig", value = "详细实体dynamicBaseScdbConfig", required = true, dataType = "DynamicBaseScdbConfig")
+    })
+    //@RequiresPermissions("dynamicbasescdbconfig:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody DynamicBaseScdbConfig model){
+        Assert.isTrue(StringUtils.isNotBlank(model.getName()), "请输入名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getUrl()), "请输入连接字符串!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getUsername()), "请输入用户名!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getPassword()), "请输入密码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getTableName()), "请输入表名!");
+        model.setId(id);
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseScdbConfig dynamicBaseScdbConfig = dynamicBaseScdbConfigService.modify(model);
+        return success(dynamicBaseScdbConfig);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasescdbconfig: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);
+			  dynamicBaseScdbConfigService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value = "导出Excel", notes = "导出Excel")
+    @GetMapping(value = "/exportExcel")//String
+    public void exportExcel(HttpServletResponse response) throws IOException {
+        List<DynamicBaseScdbConfig> list = dynamicBaseScdbConfigService.query(null);
+        ExcelUtil.exportExcel(response, list, DynamicBaseScdbConfig.class, "动态秤日报数据库配置信息");
+    }
+}

+ 9 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasescdbconfig/mapper/DynamicBaseScdbConfigMapper.java

@@ -0,0 +1,9 @@
+package com.jisco.dynamicweight.dynamicbasescdbconfig.mapper;
+
+import com.jisco.dynamicweight.dynamicbasescdbconfig.model.DynamicBaseScdbConfig;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DynamicBaseScdbConfigMapper extends IBaseMapper<DynamicBaseScdbConfig, String> {
+}

+ 443 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasescdbconfig/mapper/DynamicBaseScdbConfigMapper.xml

@@ -0,0 +1,443 @@
+<?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.jisco.dynamicweight.dynamicbasescdbconfig.mapper.DynamicBaseScdbConfigMapper">
+  <resultMap id="BaseResultMap" type="com.jisco.dynamicweight.dynamicbasescdbconfig.model.DynamicBaseScdbConfig">
+    <id column="CONFIG_NO" jdbcType="VARCHAR" property="configNo" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="URL" jdbcType="VARCHAR" property="url" />
+    <result column="USERNAME" jdbcType="VARCHAR" property="username" />
+    <result column="PASSWORD" jdbcType="VARCHAR" property="password" />
+    <result column="TABLE_NAME" jdbcType="VARCHAR" property="tableName" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <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" />
+  </resultMap>
+  <sql id="columns">
+    CONFIG_NO, NAME, URL, USERNAME, PASSWORD, TABLE_NAME, MEMO, VALID_FLAG, CREATE_MAN_NO, 
+    CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.CONFIG_NO, t.NAME, t.URL, t.USERNAME, t.PASSWORD, t.TABLE_NAME, t.MEMO, t.VALID_FLAG, 
+    t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, 
+    t.UPDATE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM DYNAMIC_BASE_SCDB_CONFIG
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DYNAMIC_BASE_SCDB_CONFIG t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="configNo != null and configNo != ''">
+        and CONFIG_NO = #{configNo}
+      </if>
+      <if test="name != null and name != ''">
+        and NAME = #{name}
+      </if>
+      <if test="url != null and url != ''">
+        and URL = #{url}
+      </if>
+      <if test="username != null and username != ''">
+        and USERNAME = #{username}
+      </if>
+      <if test="password != null and password != ''">
+        and PASSWORD = #{password}
+      </if>
+      <if test="tableName != null and tableName != ''">
+        and TABLE_NAME = #{tableName}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="configNo != null and configNo != ''">
+        and CONFIG_NO LIKE '%${configNo}%'
+      </if>
+      <if test="name != null and name != ''">
+        and NAME LIKE '%${name}%'
+      </if>
+      <if test="url != null and url != ''">
+        and URL LIKE '%${url}%'
+      </if>
+      <if test="username != null and username != ''">
+        and USERNAME LIKE '%${username}%'
+      </if>
+      <if test="password != null and password != ''">
+        and PASSWORD LIKE '%${password}%'
+      </if>
+      <if test="tableName != null and tableName != ''">
+        and TABLE_NAME LIKE '%${tableName}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from DYNAMIC_BASE_SCDB_CONFIG
+    where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DYNAMIC_BASE_SCDB_CONFIG
+    where 1!=1 
+      <if test="name != null and name != ''">
+        or NAME = #{name}
+      </if>
+      <if test="url != null and url != ''">
+        or URL = #{url}
+      </if>
+      <if test="username != null and username != ''">
+        or USERNAME = #{username}
+      </if>
+      <if test="password != null and password != ''">
+        or PASSWORD = #{password}
+      </if>
+      <if test="tableName != null and tableName != ''">
+        or TABLE_NAME = #{tableName}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.jisco.dynamicweight.dynamicbasescdbconfig.model.DynamicBaseScdbConfig">
+    insert into DYNAMIC_BASE_SCDB_CONFIG (CONFIG_NO, NAME, URL, 
+      USERNAME, PASSWORD, TABLE_NAME, 
+      MEMO, VALID_FLAG, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
+      UPDATE_MAN_NAME, UPDATE_TIME)
+    values (#{configNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, 
+      #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{tableName,jdbcType=VARCHAR}, 
+      #{memo,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, 
+      #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, 
+      #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.jisco.dynamicweight.dynamicbasescdbconfig.model.DynamicBaseScdbConfig">
+    insert into DYNAMIC_BASE_SCDB_CONFIG
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="configNo != null">
+        CONFIG_NO,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="url != null">
+        URL,
+      </if>
+      <if test="username != null">
+        USERNAME,
+      </if>
+      <if test="password != null">
+        PASSWORD,
+      </if>
+      <if test="tableName != null">
+        TABLE_NAME,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="configNo != null">
+        #{configNo,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="url != null">
+        #{url,jdbcType=VARCHAR},
+      </if>
+      <if test="username != null">
+        #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="tableName != null">
+        #{tableName,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.jisco.dynamicweight.dynamicbasescdbconfig.model.DynamicBaseScdbConfig">
+    update DYNAMIC_BASE_SCDB_CONFIG
+    set NAME = #{name,jdbcType=VARCHAR},
+      URL = #{url,jdbcType=VARCHAR},
+      USERNAME = #{username,jdbcType=VARCHAR},
+      PASSWORD = #{password,jdbcType=VARCHAR},
+      TABLE_NAME = #{tableName,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,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}
+    where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.jisco.dynamicweight.dynamicbasescdbconfig.model.DynamicBaseScdbConfig">
+    update DYNAMIC_BASE_SCDB_CONFIG
+    <set>
+      <if test="name != null">
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="url != null">
+        URL = #{url,jdbcType=VARCHAR},
+      </if>
+      <if test="username != null">
+        USERNAME = #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        PASSWORD = #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="tableName != null">
+        TABLE_NAME = #{tableName,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,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>
+    </set>
+    where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where CONFIG_NO = #{configNo,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 DYNAMIC_BASE_SCDB_CONFIG 
+      (CONFIG_NO, 
+      NAME, URL, USERNAME, 
+      PASSWORD, TABLE_NAME, MEMO, 
+      VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.configNo,jdbcType=VARCHAR}, 
+      #{item.name,jdbcType=VARCHAR}, #{item.url,jdbcType=VARCHAR}, #{item.username,jdbcType=VARCHAR}, 
+      #{item.password,jdbcType=VARCHAR}, #{item.tableName,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, 
+      #{item.validFlag,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} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update DYNAMIC_BASE_SCDB_CONFIG
+     set
+       CONFIG_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.configNo,jdbcType=VARCHAR}
+       </foreach>
+       ,NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.name,jdbcType=VARCHAR}
+       </foreach>
+       ,URL=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.url,jdbcType=VARCHAR}
+       </foreach>
+       ,USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.username,jdbcType=VARCHAR}
+       </foreach>
+       ,PASSWORD=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.password,jdbcType=VARCHAR}
+       </foreach>
+       ,TABLE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.tableName,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where CONFIG_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.configNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DYNAMIC_BASE_SCDB_CONFIG
+    where CONFIG_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 243 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasescdbconfig/model/DynamicBaseScdbConfig.java

@@ -0,0 +1,243 @@
+package com.jisco.dynamicweight.dynamicbasescdbconfig.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 DynamicBaseScdbConfig implements IBasePO<String> {
+    /**
+     * 分料数据库编号(雪花ID)(CONFIG_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="分料数据库编号(雪花ID)",required=true)
+    private String configNo;
+
+    /**
+     * 名称(NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="名称",required=true)
+    private String name;
+
+    /**
+     * 路径(URL,VARCHAR,200)
+     */
+    @ApiModelProperty(value="路径",required=true)
+    private String url;
+
+    /**
+     * 用户名(USERNAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="用户名",required=true)
+    private String username;
+
+    /**
+     * 密码(PASSWORD,VARCHAR,50)
+     */
+    @ApiModelProperty(value="密码",required=true)
+    private String password;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="表名",required=true)
+    private String tableName;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 状态(0:无效;1:有效)(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0:无效;1:有效)",required=true)
+    private String validFlag;
+
+    /**
+     * 创建人编号(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;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.configNo;
+    }
+
+    @Override
+    public void setId(String configNo) {
+        this.configNo = configNo == null ? null : configNo.trim();
+    }
+
+    public String getConfigNo() {
+        return configNo;
+    }
+
+    public void setConfigNo(String configNo) {
+        this.configNo = configNo == null ? null : configNo.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url == null ? null : url.trim();
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username == null ? null : username.trim();
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password == null ? null : password.trim();
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", configNo=").append(configNo);
+        sb.append(", name=").append(name);
+        sb.append(", url=").append(url);
+        sb.append(", username=").append(username);
+        sb.append(", password=").append(password);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", memo=").append(memo);
+        sb.append(", validFlag=").append(validFlag);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 21 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasescdbconfig/service/IDynamicBaseScdbConfigService.java

@@ -0,0 +1,21 @@
+package com.jisco.dynamicweight.dynamicbasescdbconfig.service;
+
+import com.jisco.dynamicweight.dynamicbasescdbconfig.model.DynamicBaseScdbConfig;
+import com.steerinfo.framework.service.IBaseService;
+
+/**
+ * DynamicBaseScdbConfig服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-06 05:25
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-06
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseScdbConfig服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IDynamicBaseScdbConfigService extends IBaseService<DynamicBaseScdbConfig, String>{
+
+}

+ 34 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasescdbconfig/service/impl/DynamicBaseScdbConfigServiceImpl.java

@@ -0,0 +1,34 @@
+package com.jisco.dynamicweight.dynamicbasescdbconfig.service.impl;
+
+import com.jisco.dynamicweight.dynamicbasescdbconfig.mapper.DynamicBaseScdbConfigMapper;
+import com.jisco.dynamicweight.dynamicbasescdbconfig.model.DynamicBaseScdbConfig;
+import com.jisco.dynamicweight.dynamicbasescdbconfig.service.IDynamicBaseScdbConfigService;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * DynamicBaseScdbConfig服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-06 05:25
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-06
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseScdbConfig服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "dynamicBaseScdbConfigService")
+public class DynamicBaseScdbConfigServiceImpl extends BaseServiceImpl<DynamicBaseScdbConfig, String> implements IDynamicBaseScdbConfigService {
+
+    @Autowired
+    private DynamicBaseScdbConfigMapper dynamicBaseScdbConfigMapper;
+
+    @Override
+    protected IBaseMapper<DynamicBaseScdbConfig, String> getMapper() {
+        return dynamicBaseScdbConfigMapper;
+    }
+}

+ 149 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasescstation/controller/DynamicBaseScStationController.java

@@ -0,0 +1,149 @@
+package com.jisco.dynamicweight.dynamicbasescstation.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever;
+import com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation;
+import com.jisco.dynamicweight.dynamicbasescstation.service.IDynamicBaseScStationService;
+import com.jisco.dynamicweight.util.ExcelUtil;
+import com.jisco.dynamicweight.util.UserUtil;
+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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * DynamicBaseScStation RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-05 11:28
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-05
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseScStation RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/dynamicbasescstations")
+public class DynamicBaseScStationController extends BaseRESTfulController {
+
+    @Autowired
+    IDynamicBaseScStationService dynamicBaseScStationService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("dynamicbasescstation:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicBaseScStation> list = dynamicBaseScStationService.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("dynamicbasescstation:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicBaseScStation> list = dynamicBaseScStationService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据DynamicBaseScStation对象创建")
+    @ApiImplicitParam(name = "dynamicBaseScStation", value = "详细实体dynamicBaseScStation", required = true, dataType = "DynamicBaseScStation")
+    //@RequiresPermissions("dynamicbasescstation:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody DynamicBaseScStation model){
+        Assert.isTrue(StringUtils.isNotBlank(model.getName()), "请输入皮带秤名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getStationNum()), "请输入数采系统站点编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialName()), "请输入物料名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getSenderCode()), "请输入发货库房编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getSenderName()), "请输入发货库房!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getSenderType()), "请输入发货点类型!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverCode()), "请输入收货库房编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverName()), "请输入收货库房!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverType()), "请输入收货点类型!");
+        model.setValidFlag("0");
+        model.setCreateManNo(UserUtil.getCurrentUserId());
+        model.setCreateManName(UserUtil.getCurrentUserName());
+        model.setCreateTime(new Date());
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseScStation dynamicBaseScStation = dynamicBaseScStationService.add(model);
+        return success(dynamicBaseScStation);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasescstation:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        DynamicBaseScStation dynamicBaseScStation = dynamicBaseScStationService.getById(id);
+        return success(dynamicBaseScStation);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的dynamicBaseScStation信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "dynamicBaseScStation", value = "详细实体dynamicBaseScStation", required = true, dataType = "DynamicBaseScStation")
+    })
+    //@RequiresPermissions("dynamicbasescstation:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody DynamicBaseScStation model){
+        Assert.isTrue(StringUtils.isNotBlank(model.getName()), "请输入皮带秤名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getStationNum()), "请输入数采系统站点编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialName()), "请输入物料名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getSenderCode()), "请输入发货库房编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getSenderName()), "请输入发货库房!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getSenderType()), "请输入发货点类型!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverCode()), "请输入收货库房编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverName()), "请输入收货库房!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverType()), "请输入收货点类型!");
+        model.setId(id);
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseScStation dynamicBaseScStation = dynamicBaseScStationService.modify(model);
+        return success(dynamicBaseScStation);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasescstation: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);
+			  dynamicBaseScStationService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value = "导出Excel", notes = "导出Excel")
+    @GetMapping(value = "/exportExcel")//String
+    public void exportExcel(HttpServletResponse response) throws IOException {
+        List<DynamicBaseScStation> list = dynamicBaseScStationService.query(null);
+        ExcelUtil.exportExcel(response, list, DynamicBaseScStation.class, "动态秤日报站点信息");
+    }
+}

+ 9 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasescstation/mapper/DynamicBaseScStationMapper.java

@@ -0,0 +1,9 @@
+package com.jisco.dynamicweight.dynamicbasescstation.mapper;
+
+import com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DynamicBaseScStationMapper extends IBaseMapper<DynamicBaseScStation, String> {
+}

+ 573 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasescstation/mapper/DynamicBaseScStationMapper.xml

@@ -0,0 +1,573 @@
+<?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.jisco.dynamicweight.dynamicbasescstation.mapper.DynamicBaseScStationMapper">
+  <resultMap id="BaseResultMap" type="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
+    <id column="STATION_NO" jdbcType="VARCHAR" property="stationNo" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="STATION_NUM" jdbcType="VARCHAR" property="stationNum" />
+    <result column="MATERIAL_CODE" jdbcType="VARCHAR" property="materialCode" />
+    <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName" />
+    <result column="SENDER_CODE" jdbcType="VARCHAR" property="senderCode" />
+    <result column="SENDER_NAME" jdbcType="VARCHAR" property="senderName" />
+    <result column="SENDER_TYPE" jdbcType="VARCHAR" property="senderType" />
+    <result column="RECIEVER_CODE" jdbcType="VARCHAR" property="recieverCode" />
+    <result column="RECIEVER_NAME" jdbcType="VARCHAR" property="recieverName" />
+    <result column="RECIEVER_TYPE" jdbcType="VARCHAR" property="recieverType" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <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" />
+  </resultMap>
+  <sql id="columns">
+    STATION_NO, NAME, STATION_NUM, MATERIAL_CODE, MATERIAL_NAME, SENDER_CODE, SENDER_NAME, 
+    SENDER_TYPE, RECIEVER_CODE, RECIEVER_NAME, RECIEVER_TYPE, MEMO, VALID_FLAG, CREATE_MAN_NO, 
+    CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.STATION_NO, t.NAME, t.STATION_NUM, t.MATERIAL_CODE, t.MATERIAL_NAME, t.SENDER_CODE, 
+    t.SENDER_NAME, t.SENDER_TYPE, t.RECIEVER_CODE, t.RECIEVER_NAME, t.RECIEVER_TYPE, 
+    t.MEMO, t.VALID_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, 
+    t.UPDATE_MAN_NAME, t.UPDATE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM DYNAMIC_BASE_SC_STATION
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DYNAMIC_BASE_SC_STATION t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="stationNo != null and stationNo != ''">
+        and STATION_NO = #{stationNo}
+      </if>
+      <if test="name != null and name != ''">
+        and NAME = #{name}
+      </if>
+      <if test="stationNum != null and stationNum != ''">
+        and STATION_NUM = #{stationNum}
+      </if>
+      <if test="materialCode != null and materialCode != ''">
+        and MATERIAL_CODE = #{materialCode}
+      </if>
+      <if test="materialName != null and materialName != ''">
+        and MATERIAL_NAME = #{materialName}
+      </if>
+      <if test="senderCode != null and senderCode != ''">
+        and SENDER_CODE = #{senderCode}
+      </if>
+      <if test="senderName != null and senderName != ''">
+        and SENDER_NAME = #{senderName}
+      </if>
+      <if test="senderType != null and senderType != ''">
+        and SENDER_TYPE = #{senderType}
+      </if>
+      <if test="recieverCode != null and recieverCode != ''">
+        and RECIEVER_CODE = #{recieverCode}
+      </if>
+      <if test="recieverName != null and recieverName != ''">
+        and RECIEVER_NAME = #{recieverName}
+      </if>
+      <if test="recieverType != null and recieverType != ''">
+        and RECIEVER_TYPE = #{recieverType}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="stationNo != null and stationNo != ''">
+        and STATION_NO LIKE '%${stationNo}%'
+      </if>
+      <if test="name != null and name != ''">
+        and NAME LIKE '%${name}%'
+      </if>
+      <if test="stationNum != null and stationNum != ''">
+        and STATION_NUM LIKE '%${stationNum}%'
+      </if>
+      <if test="materialCode != null and materialCode != ''">
+        and MATERIAL_CODE LIKE '%${materialCode}%'
+      </if>
+      <if test="materialName != null and materialName != ''">
+        and MATERIAL_NAME LIKE '%${materialName}%'
+      </if>
+      <if test="senderCode != null and senderCode != ''">
+        and SENDER_CODE LIKE '%${senderCode}%'
+      </if>
+      <if test="senderName != null and senderName != ''">
+        and SENDER_NAME LIKE '%${senderName}%'
+      </if>
+      <if test="senderType != null and senderType != ''">
+        and SENDER_TYPE LIKE '%${senderType}%'
+      </if>
+      <if test="recieverCode != null and recieverCode != ''">
+        and RECIEVER_CODE LIKE '%${recieverCode}%'
+      </if>
+      <if test="recieverName != null and recieverName != ''">
+        and RECIEVER_NAME LIKE '%${recieverName}%'
+      </if>
+      <if test="recieverType != null and recieverType != ''">
+        and RECIEVER_TYPE LIKE '%${recieverType}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from DYNAMIC_BASE_SC_STATION
+    where STATION_NO = #{stationNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DYNAMIC_BASE_SC_STATION
+    where 1!=1 
+      <if test="name != null and name != ''">
+        or NAME = #{name}
+      </if>
+      <if test="stationNum != null and stationNum != ''">
+        or STATION_NUM = #{stationNum}
+      </if>
+      <if test="materialCode != null and materialCode != ''">
+        or MATERIAL_CODE = #{materialCode}
+      </if>
+      <if test="materialName != null and materialName != ''">
+        or MATERIAL_NAME = #{materialName}
+      </if>
+      <if test="senderCode != null and senderCode != ''">
+        or SENDER_CODE = #{senderCode}
+      </if>
+      <if test="senderName != null and senderName != ''">
+        or SENDER_NAME = #{senderName}
+      </if>
+      <if test="senderType != null and senderType != ''">
+        or SENDER_TYPE = #{senderType}
+      </if>
+      <if test="recieverCode != null and recieverCode != ''">
+        or RECIEVER_CODE = #{recieverCode}
+      </if>
+      <if test="recieverName != null and recieverName != ''">
+        or RECIEVER_NAME = #{recieverName}
+      </if>
+      <if test="recieverType != null and recieverType != ''">
+        or RECIEVER_TYPE = #{recieverType}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
+    insert into DYNAMIC_BASE_SC_STATION (STATION_NO, NAME, STATION_NUM, 
+      MATERIAL_CODE, MATERIAL_NAME, SENDER_CODE, 
+      SENDER_NAME, SENDER_TYPE, RECIEVER_CODE, 
+      RECIEVER_NAME, RECIEVER_TYPE, MEMO, 
+      VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME)
+    values (#{stationNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{stationNum,jdbcType=VARCHAR}, 
+      #{materialCode,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, #{senderCode,jdbcType=VARCHAR}, 
+      #{senderName,jdbcType=VARCHAR}, #{senderType,jdbcType=VARCHAR}, #{recieverCode,jdbcType=VARCHAR}, 
+      #{recieverName,jdbcType=VARCHAR}, #{recieverType,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
+      #{validFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
+    insert into DYNAMIC_BASE_SC_STATION
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="stationNo != null">
+        STATION_NO,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="stationNum != null">
+        STATION_NUM,
+      </if>
+      <if test="materialCode != null">
+        MATERIAL_CODE,
+      </if>
+      <if test="materialName != null">
+        MATERIAL_NAME,
+      </if>
+      <if test="senderCode != null">
+        SENDER_CODE,
+      </if>
+      <if test="senderName != null">
+        SENDER_NAME,
+      </if>
+      <if test="senderType != null">
+        SENDER_TYPE,
+      </if>
+      <if test="recieverCode != null">
+        RECIEVER_CODE,
+      </if>
+      <if test="recieverName != null">
+        RECIEVER_NAME,
+      </if>
+      <if test="recieverType != null">
+        RECIEVER_TYPE,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="stationNo != null">
+        #{stationNo,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="stationNum != null">
+        #{stationNum,jdbcType=VARCHAR},
+      </if>
+      <if test="materialCode != null">
+        #{materialCode,jdbcType=VARCHAR},
+      </if>
+      <if test="materialName != null">
+        #{materialName,jdbcType=VARCHAR},
+      </if>
+      <if test="senderCode != null">
+        #{senderCode,jdbcType=VARCHAR},
+      </if>
+      <if test="senderName != null">
+        #{senderName,jdbcType=VARCHAR},
+      </if>
+      <if test="senderType != null">
+        #{senderType,jdbcType=VARCHAR},
+      </if>
+      <if test="recieverCode != null">
+        #{recieverCode,jdbcType=VARCHAR},
+      </if>
+      <if test="recieverName != null">
+        #{recieverName,jdbcType=VARCHAR},
+      </if>
+      <if test="recieverType != null">
+        #{recieverType,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
+    update DYNAMIC_BASE_SC_STATION
+    set NAME = #{name,jdbcType=VARCHAR},
+      STATION_NUM = #{stationNum,jdbcType=VARCHAR},
+      MATERIAL_CODE = #{materialCode,jdbcType=VARCHAR},
+      MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
+      SENDER_CODE = #{senderCode,jdbcType=VARCHAR},
+      SENDER_NAME = #{senderName,jdbcType=VARCHAR},
+      SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
+      RECIEVER_CODE = #{recieverCode,jdbcType=VARCHAR},
+      RECIEVER_NAME = #{recieverName,jdbcType=VARCHAR},
+      RECIEVER_TYPE = #{recieverType,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,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}
+    where STATION_NO = #{stationNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
+    update DYNAMIC_BASE_SC_STATION
+    <set>
+      <if test="name != null">
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="stationNum != null">
+        STATION_NUM = #{stationNum,jdbcType=VARCHAR},
+      </if>
+      <if test="materialCode != null">
+        MATERIAL_CODE = #{materialCode,jdbcType=VARCHAR},
+      </if>
+      <if test="materialName != null">
+        MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
+      </if>
+      <if test="senderCode != null">
+        SENDER_CODE = #{senderCode,jdbcType=VARCHAR},
+      </if>
+      <if test="senderName != null">
+        SENDER_NAME = #{senderName,jdbcType=VARCHAR},
+      </if>
+      <if test="senderType != null">
+        SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
+      </if>
+      <if test="recieverCode != null">
+        RECIEVER_CODE = #{recieverCode,jdbcType=VARCHAR},
+      </if>
+      <if test="recieverName != null">
+        RECIEVER_NAME = #{recieverName,jdbcType=VARCHAR},
+      </if>
+      <if test="recieverType != null">
+        RECIEVER_TYPE = #{recieverType,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,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>
+    </set>
+    where STATION_NO = #{stationNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where STATION_NO = #{stationNo,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 DYNAMIC_BASE_SC_STATION 
+      (STATION_NO, 
+      NAME, STATION_NUM, MATERIAL_CODE, 
+      MATERIAL_NAME, SENDER_CODE, SENDER_NAME, 
+      SENDER_TYPE, RECIEVER_CODE, RECIEVER_NAME, 
+      RECIEVER_TYPE, MEMO, VALID_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.stationNo,jdbcType=VARCHAR}, 
+      #{item.name,jdbcType=VARCHAR}, #{item.stationNum,jdbcType=VARCHAR}, #{item.materialCode,jdbcType=VARCHAR}, 
+      #{item.materialName,jdbcType=VARCHAR}, #{item.senderCode,jdbcType=VARCHAR}, #{item.senderName,jdbcType=VARCHAR}, 
+      #{item.senderType,jdbcType=VARCHAR}, #{item.recieverCode,jdbcType=VARCHAR}, #{item.recieverName,jdbcType=VARCHAR}, 
+      #{item.recieverType,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,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}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update DYNAMIC_BASE_SC_STATION
+     set
+       STATION_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.stationNo,jdbcType=VARCHAR}
+       </foreach>
+       ,NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.name,jdbcType=VARCHAR}
+       </foreach>
+       ,STATION_NUM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.stationNum,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIAL_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.materialCode,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIAL_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.materialName,jdbcType=VARCHAR}
+       </foreach>
+       ,SENDER_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.senderCode,jdbcType=VARCHAR}
+       </foreach>
+       ,SENDER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.senderName,jdbcType=VARCHAR}
+       </foreach>
+       ,SENDER_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.senderType,jdbcType=VARCHAR}
+       </foreach>
+       ,RECIEVER_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.recieverCode,jdbcType=VARCHAR}
+       </foreach>
+       ,RECIEVER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.recieverName,jdbcType=VARCHAR}
+       </foreach>
+       ,RECIEVER_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.recieverType,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+          when #{item.stationNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where STATION_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.stationNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DYNAMIC_BASE_SC_STATION
+    where STATION_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 318 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasescstation/model/DynamicBaseScStation.java

@@ -0,0 +1,318 @@
+package com.jisco.dynamicweight.dynamicbasescstation.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 DynamicBaseScStation implements IBasePO<String> {
+    /**
+     * 站点编号(雪花ID)(STATION_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="站点编号(雪花ID)",required=true)
+    private String stationNo;
+
+    /**
+     * 名称(NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="名称",required=true)
+    private String name;
+
+    /**
+     * 数采系统站点编码(STATION_NUM,VARCHAR,20)
+     */
+    @ApiModelProperty(value="数采系统站点编码",required=true)
+    private String stationNum;
+
+    /**
+     * 物料编码(MATERIAL_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物料编码",required=false)
+    private String materialCode;
+
+    /**
+     * 物料名称(MATERIAL_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="物料名称",required=true)
+    private String materialName;
+
+    /**
+     * 发货库房编码(SENDER_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="发货库房编码",required=true)
+    private String senderCode;
+
+    /**
+     * 发货库房(SENDER_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="发货库房",required=true)
+    private String senderName;
+
+    /**
+     * 发货点类型(SENDER_TYPE,VARCHAR,10)
+     */
+    @ApiModelProperty(value="发货点类型",required=true)
+    private String senderType;
+
+    /**
+     * 收货库房编码(RECIEVER_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="收货库房编码",required=true)
+    private String recieverCode;
+
+    /**
+     * 收货库房(RECIEVER_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="收货库房",required=true)
+    private String recieverName;
+
+    /**
+     * 收货点类型(RECIEVER_TYPE,VARCHAR,10)
+     */
+    @ApiModelProperty(value="收货点类型",required=true)
+    private String recieverType;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 状态(0:无效;1:有效)(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0:无效;1:有效)",required=true)
+    private String validFlag;
+
+    /**
+     * 创建人编号(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;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.stationNo;
+    }
+
+    @Override
+    public void setId(String stationNo) {
+        this.stationNo = stationNo == null ? null : stationNo.trim();
+    }
+
+    public String getStationNo() {
+        return stationNo;
+    }
+
+    public void setStationNo(String stationNo) {
+        this.stationNo = stationNo == null ? null : stationNo.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getStationNum() {
+        return stationNum;
+    }
+
+    public void setStationNum(String stationNum) {
+        this.stationNum = stationNum == null ? null : stationNum.trim();
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode == null ? null : materialCode.trim();
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName == null ? null : materialName.trim();
+    }
+
+    public String getSenderCode() {
+        return senderCode;
+    }
+
+    public void setSenderCode(String senderCode) {
+        this.senderCode = senderCode == null ? null : senderCode.trim();
+    }
+
+    public String getSenderName() {
+        return senderName;
+    }
+
+    public void setSenderName(String senderName) {
+        this.senderName = senderName == null ? null : senderName.trim();
+    }
+
+    public String getSenderType() {
+        return senderType;
+    }
+
+    public void setSenderType(String senderType) {
+        this.senderType = senderType == null ? null : senderType.trim();
+    }
+
+    public String getRecieverCode() {
+        return recieverCode;
+    }
+
+    public void setRecieverCode(String recieverCode) {
+        this.recieverCode = recieverCode == null ? null : recieverCode.trim();
+    }
+
+    public String getRecieverName() {
+        return recieverName;
+    }
+
+    public void setRecieverName(String recieverName) {
+        this.recieverName = recieverName == null ? null : recieverName.trim();
+    }
+
+    public String getRecieverType() {
+        return recieverType;
+    }
+
+    public void setRecieverType(String recieverType) {
+        this.recieverType = recieverType == null ? null : recieverType.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", stationNo=").append(stationNo);
+        sb.append(", name=").append(name);
+        sb.append(", stationNum=").append(stationNum);
+        sb.append(", materialCode=").append(materialCode);
+        sb.append(", materialName=").append(materialName);
+        sb.append(", senderCode=").append(senderCode);
+        sb.append(", senderName=").append(senderName);
+        sb.append(", senderType=").append(senderType);
+        sb.append(", recieverCode=").append(recieverCode);
+        sb.append(", recieverName=").append(recieverName);
+        sb.append(", recieverType=").append(recieverType);
+        sb.append(", memo=").append(memo);
+        sb.append(", validFlag=").append(validFlag);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 21 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasescstation/service/IDynamicBaseScStationService.java

@@ -0,0 +1,21 @@
+package com.jisco.dynamicweight.dynamicbasescstation.service;
+
+import com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation;
+import com.steerinfo.framework.service.IBaseService;
+
+/**
+ * DynamicBaseScStation服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-05 11:28
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-05
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseScStation服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IDynamicBaseScStationService extends IBaseService<DynamicBaseScStation, String>{
+
+}

+ 34 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasescstation/service/impl/DynamicBaseScStationServiceImpl.java

@@ -0,0 +1,34 @@
+package com.jisco.dynamicweight.dynamicbasescstation.service.impl;
+
+import com.jisco.dynamicweight.dynamicbasescstation.mapper.DynamicBaseScStationMapper;
+import com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation;
+import com.jisco.dynamicweight.dynamicbasescstation.service.IDynamicBaseScStationService;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * DynamicBaseScStation服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-05 11:28
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-05
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseScStation服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "dynamicBaseScStationService")
+public class DynamicBaseScStationServiceImpl extends BaseServiceImpl<DynamicBaseScStation, String> implements IDynamicBaseScStationService {
+
+    @Autowired
+    private DynamicBaseScStationMapper dynamicBaseScStationMapper;
+
+    @Override
+    protected IBaseMapper<DynamicBaseScStation, String> getMapper() {
+        return dynamicBaseScStationMapper;
+    }
+}

+ 138 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasesender/controller/DynamicBaseSenderController.java

@@ -0,0 +1,138 @@
+package com.jisco.dynamicweight.dynamicbasesender.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever;
+import com.jisco.dynamicweight.util.ExcelUtil;
+import com.jisco.dynamicweight.util.UserUtil;
+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.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender;
+import com.jisco.dynamicweight.dynamicbasesender.service.IDynamicBaseSenderService;
+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 javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.*;
+import java.math.BigDecimal;
+
+/**
+ * DynamicBaseSender RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-04 03:49
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-04
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseSender RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/dynamicbasesenders")
+public class DynamicBaseSenderController extends BaseRESTfulController {
+
+    @Autowired
+    IDynamicBaseSenderService dynamicBaseSenderService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("dynamicbasesender:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicBaseSender> list = dynamicBaseSenderService.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("dynamicbasesender:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicBaseSender> list = dynamicBaseSenderService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据DynamicBaseSender对象创建")
+    @ApiImplicitParam(name = "dynamicBaseSender", value = "详细实体dynamicBaseSender", required = true, dataType = "DynamicBaseSender")
+    //@RequiresPermissions("dynamicbasesender:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody DynamicBaseSender model){
+        Assert.isTrue(StringUtils.isNotBlank(model.getSenderName()), "请输入PIKA系统发货单位名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getSenderCode()), "请输入PIKA系统发货单位编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getSenderType()), "请输入发货点类型!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getDisSysName()), "请输入分料系统名称!");
+        model.setValidFlag("0");
+        model.setCreateManNo(UserUtil.getCurrentUserId());
+        model.setCreateManName(UserUtil.getCurrentUserName());
+        model.setCreateTime(new Date());
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseSender dynamicBaseSender = dynamicBaseSenderService.add(model);
+        return success(dynamicBaseSender);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasesender:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        DynamicBaseSender dynamicBaseSender = dynamicBaseSenderService.getById(id);
+        return success(dynamicBaseSender);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的dynamicBaseSender信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "dynamicBaseSender", value = "详细实体dynamicBaseSender", required = true, dataType = "DynamicBaseSender")
+    })
+    //@RequiresPermissions("dynamicbasesender:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody DynamicBaseSender model){
+        Assert.isTrue(StringUtils.isNotBlank(model.getSenderName()), "请输入PIKA系统发货单位名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getSenderCode()), "请输入PIKA系统发货单位编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getSenderType()), "请输入发货点类型!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getDisSysName()), "请输入分料系统名称!");
+        model.setId(id);
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseSender dynamicBaseSender = dynamicBaseSenderService.modify(model);
+        return success(dynamicBaseSender);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasesender: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);
+			  dynamicBaseSenderService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value = "导出Excel", notes = "导出Excel")
+    @GetMapping(value = "/exportExcel")//String
+    public void exportExcel(HttpServletResponse response) throws IOException {
+        List<DynamicBaseSender> list = dynamicBaseSenderService.query(null);
+        ExcelUtil.exportExcel(response, list, DynamicBaseSender.class, "发货单位信息");
+    }
+}

+ 10 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasesender/mapper/DynamicBaseSenderMapper.java

@@ -0,0 +1,10 @@
+package com.jisco.dynamicweight.dynamicbasesender.mapper;
+
+import com.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DynamicBaseSenderMapper extends IBaseMapper<DynamicBaseSender, String> {
+}

+ 419 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasesender/mapper/DynamicBaseSenderMapper.xml

@@ -0,0 +1,419 @@
+<?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.jisco.dynamicweight.dynamicbasesender.mapper.DynamicBaseSenderMapper">
+  <resultMap id="BaseResultMap" type="com.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender">
+    <id column="SENDER_NO" jdbcType="VARCHAR" property="senderNo" />
+    <result column="SENDER_NAME" jdbcType="VARCHAR" property="senderName" />
+    <result column="SENDER_CODE" jdbcType="VARCHAR" property="senderCode" />
+    <result column="SENDER_TYPE" jdbcType="VARCHAR" property="senderType" />
+    <result column="DIS_SYS_NAME" jdbcType="VARCHAR" property="disSysName" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <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" />
+  </resultMap>
+  <sql id="columns">
+    SENDER_NO, SENDER_NAME, SENDER_CODE, SENDER_TYPE, DIS_SYS_NAME, MEMO, VALID_FLAG, 
+    CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.SENDER_NO, t.SENDER_NAME, t.SENDER_CODE, t.SENDER_TYPE, t.DIS_SYS_NAME, t.MEMO, 
+    t.VALID_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, 
+    t.UPDATE_MAN_NAME, t.UPDATE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM DYNAMIC_BASE_SENDER
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DYNAMIC_BASE_SENDER t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="senderNo != null and senderNo != ''">
+        and SENDER_NO = #{senderNo}
+      </if>
+      <if test="senderName != null and senderName != ''">
+        and SENDER_NAME = #{senderName}
+      </if>
+      <if test="senderCode != null and senderCode != ''">
+        and SENDER_CODE = #{senderCode}
+      </if>
+      <if test="senderType != null and senderType != ''">
+        and SENDER_TYPE = #{senderType}
+      </if>
+      <if test="disSysName != null and disSysName != ''">
+        and DIS_SYS_NAME = #{disSysName}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="senderNo != null and senderNo != ''">
+        and SENDER_NO LIKE '%${senderNo}%'
+      </if>
+      <if test="senderName != null and senderName != ''">
+        and SENDER_NAME LIKE '%${senderName}%'
+      </if>
+      <if test="senderCode != null and senderCode != ''">
+        and SENDER_CODE LIKE '%${senderCode}%'
+      </if>
+      <if test="senderType != null and senderType != ''">
+        and SENDER_TYPE LIKE '%${senderType}%'
+      </if>
+      <if test="disSysName != null and disSysName != ''">
+        and DIS_SYS_NAME LIKE '%${disSysName}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from DYNAMIC_BASE_SENDER
+    where SENDER_NO = #{senderNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DYNAMIC_BASE_SENDER
+    where 1!=1 
+      <if test="senderName != null and senderName != ''">
+        or SENDER_NAME = #{senderName}
+      </if>
+      <if test="senderCode != null and senderCode != ''">
+        or SENDER_CODE = #{senderCode}
+      </if>
+      <if test="senderType != null and senderType != ''">
+        or SENDER_TYPE = #{senderType}
+      </if>
+      <if test="disSysName != null and disSysName != ''">
+        or DIS_SYS_NAME = #{disSysName}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender">
+    insert into DYNAMIC_BASE_SENDER (SENDER_NO, SENDER_NAME, SENDER_CODE, 
+      SENDER_TYPE, DIS_SYS_NAME, MEMO, 
+      VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME)
+    values (#{senderNo,jdbcType=VARCHAR}, #{senderName,jdbcType=VARCHAR}, #{senderCode,jdbcType=VARCHAR}, 
+      #{senderType,jdbcType=VARCHAR}, #{disSysName,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
+      #{validFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender">
+    insert into DYNAMIC_BASE_SENDER
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="senderNo != null">
+        SENDER_NO,
+      </if>
+      <if test="senderName != null">
+        SENDER_NAME,
+      </if>
+      <if test="senderCode != null">
+        SENDER_CODE,
+      </if>
+      <if test="senderType != null">
+        SENDER_TYPE,
+      </if>
+      <if test="disSysName != null">
+        DIS_SYS_NAME,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="senderNo != null">
+        #{senderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="senderName != null">
+        #{senderName,jdbcType=VARCHAR},
+      </if>
+      <if test="senderCode != null">
+        #{senderCode,jdbcType=VARCHAR},
+      </if>
+      <if test="senderType != null">
+        #{senderType,jdbcType=VARCHAR},
+      </if>
+      <if test="disSysName != null">
+        #{disSysName,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender">
+    update DYNAMIC_BASE_SENDER
+    set SENDER_NAME = #{senderName,jdbcType=VARCHAR},
+      SENDER_CODE = #{senderCode,jdbcType=VARCHAR},
+      SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
+      DIS_SYS_NAME = #{disSysName,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,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}
+    where SENDER_NO = #{senderNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender">
+    update DYNAMIC_BASE_SENDER
+    <set>
+      <if test="senderName != null">
+        SENDER_NAME = #{senderName,jdbcType=VARCHAR},
+      </if>
+      <if test="senderCode != null">
+        SENDER_CODE = #{senderCode,jdbcType=VARCHAR},
+      </if>
+      <if test="senderType != null">
+        SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
+      </if>
+      <if test="disSysName != null">
+        DIS_SYS_NAME = #{disSysName,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,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>
+    </set>
+    where SENDER_NO = #{senderNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where SENDER_NO = #{senderNo,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 DYNAMIC_BASE_SENDER 
+      (SENDER_NO, 
+      SENDER_NAME, SENDER_CODE, SENDER_TYPE, 
+      DIS_SYS_NAME, MEMO, VALID_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.senderNo,jdbcType=VARCHAR}, 
+      #{item.senderName,jdbcType=VARCHAR}, #{item.senderCode,jdbcType=VARCHAR}, #{item.senderType,jdbcType=VARCHAR}, 
+      #{item.disSysName,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,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}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update DYNAMIC_BASE_SENDER
+     set
+       SENDER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SENDER_NO" close="end">
+          when #{item.senderNo,jdbcType=VARCHAR} then #{item.senderNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SENDER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SENDER_NO" close="end">
+          when #{item.senderNo,jdbcType=VARCHAR} then #{item.senderName,jdbcType=VARCHAR}
+       </foreach>
+       ,SENDER_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SENDER_NO" close="end">
+          when #{item.senderNo,jdbcType=VARCHAR} then #{item.senderCode,jdbcType=VARCHAR}
+       </foreach>
+       ,SENDER_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SENDER_NO" close="end">
+          when #{item.senderNo,jdbcType=VARCHAR} then #{item.senderType,jdbcType=VARCHAR}
+       </foreach>
+       ,DIS_SYS_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SENDER_NO" close="end">
+          when #{item.senderNo,jdbcType=VARCHAR} then #{item.disSysName,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SENDER_NO" close="end">
+          when #{item.senderNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SENDER_NO" close="end">
+          when #{item.senderNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SENDER_NO" close="end">
+          when #{item.senderNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SENDER_NO" close="end">
+          when #{item.senderNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SENDER_NO" close="end">
+          when #{item.senderNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SENDER_NO" close="end">
+          when #{item.senderNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SENDER_NO" close="end">
+          when #{item.senderNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SENDER_NO" close="end">
+          when #{item.senderNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where SENDER_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.senderNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DYNAMIC_BASE_SENDER
+    where SENDER_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 227 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasesender/model/DynamicBaseSender.java

@@ -0,0 +1,227 @@
+package com.jisco.dynamicweight.dynamicbasesender.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 DynamicBaseSender implements IBasePO<String> {
+    /**
+     * 发货单位ID(雪花ID)(SENDER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="发货单位ID(雪花ID)",required=true)
+    private String senderNo;
+
+    /**
+     * 发货单位(SENDER_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="发货单位",required=true)
+    private String senderName;
+
+    /**
+     * 发货单位编码(SENDER_CODE,VARCHAR,60)
+     */
+    @ApiModelProperty(value="发货单位编码",required=true)
+    private String senderCode;
+
+    /**
+     * 发货点类型(SENDER_TYPE,VARCHAR,60)
+     */
+    @ApiModelProperty(value="发货点类型",required=true)
+    private String senderType;
+
+    /**
+     * 分料系统名称(DIS_SYS_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="分料系统名称",required=true)
+    private String disSysName;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 状态(0:无效;1:有效)(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0:无效;1:有效)",required=true)
+    private String validFlag;
+
+    /**
+     * 创建人编号(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;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.senderNo;
+    }
+
+    @Override
+    public void setId(String senderNo) {
+        this.senderNo = senderNo == null ? null : senderNo.trim();
+    }
+
+    public String getSenderNo() {
+        return senderNo;
+    }
+
+    public void setSenderNo(String senderNo) {
+        this.senderNo = senderNo == null ? null : senderNo.trim();
+    }
+
+    public String getSenderName() {
+        return senderName;
+    }
+
+    public void setSenderName(String senderName) {
+        this.senderName = senderName == null ? null : senderName.trim();
+    }
+
+    public String getSenderCode() {
+        return senderCode;
+    }
+
+    public void setSenderCode(String senderCode) {
+        this.senderCode = senderCode == null ? null : senderCode.trim();
+    }
+
+    public String getSenderType() {
+        return senderType;
+    }
+
+    public void setSenderType(String senderType) {
+        this.senderType = senderType == null ? null : senderType.trim();
+    }
+
+    public String getDisSysName() {
+        return disSysName;
+    }
+
+    public void setDisSysName(String disSysName) {
+        this.disSysName = disSysName == null ? null : disSysName.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", senderNo=").append(senderNo);
+        sb.append(", senderName=").append(senderName);
+        sb.append(", senderCode=").append(senderCode);
+        sb.append(", senderType=").append(senderType);
+        sb.append(", disSysName=").append(disSysName);
+        sb.append(", memo=").append(memo);
+        sb.append(", validFlag=").append(validFlag);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 23 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasesender/service/IDynamicBaseSenderService.java

@@ -0,0 +1,23 @@
+package com.jisco.dynamicweight.dynamicbasesender.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * DynamicBaseSender服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-04 03:49
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-04
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseSender服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IDynamicBaseSenderService extends IBaseService<DynamicBaseSender, String>{
+
+}

+ 36 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasesender/service/impl/DynamicBaseSenderServiceImpl.java

@@ -0,0 +1,36 @@
+package com.jisco.dynamicweight.dynamicbasesender.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender;
+import com.jisco.dynamicweight.dynamicbasesender.mapper.DynamicBaseSenderMapper;
+import com.jisco.dynamicweight.dynamicbasesender.service.IDynamicBaseSenderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * DynamicBaseSender服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-04 03:49
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-04
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseSender服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "dynamicBaseSenderService")
+public class DynamicBaseSenderServiceImpl extends BaseServiceImpl<DynamicBaseSender, String> implements IDynamicBaseSenderService {
+
+    @Autowired
+    private DynamicBaseSenderMapper dynamicBaseSenderMapper;
+
+    @Override
+    protected IBaseMapper<DynamicBaseSender, String> getMapper() {
+        return dynamicBaseSenderMapper;
+    }
+}

+ 139 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasestationmaterial/controller/DynamicBaseStationMaterialController.java

@@ -0,0 +1,139 @@
+package com.jisco.dynamicweight.dynamicbasestationmaterial.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.jisco.dynamicweight.dynamicbasemeterial.model.DynamicBaseMeterial;
+import com.jisco.dynamicweight.dynamicbasestationmaterial.model.DynamicBaseStationMaterial;
+import com.jisco.dynamicweight.dynamicbasestationmaterial.service.IDynamicBaseStationMaterialService;
+import com.jisco.dynamicweight.util.ExcelUtil;
+import com.jisco.dynamicweight.util.UserUtil;
+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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * DynamicBaseStationMaterial RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-06 05:25
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-06
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseStationMaterial RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/dynamicbasestationmaterials")
+public class DynamicBaseStationMaterialController extends BaseRESTfulController {
+
+    @Autowired
+    IDynamicBaseStationMaterialService dynamicBaseStationMaterialService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("dynamicbasestationmaterial:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicBaseStationMaterial> list = dynamicBaseStationMaterialService.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("dynamicbasestationmaterial:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicBaseStationMaterial> list = dynamicBaseStationMaterialService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据DynamicBaseStationMaterial对象创建")
+    @ApiImplicitParam(name = "dynamicBaseStationMaterial", value = "详细实体dynamicBaseStationMaterial", required = true, dataType = "DynamicBaseStationMaterial")
+    //@RequiresPermissions("dynamicbasestationmaterial:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody DynamicBaseStationMaterial model){
+//        Assert.isTrue(StringUtils.isNotBlank(model.getStationNo()), "请输站点编号!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getStationName()), "请输入站点名称!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialNo()), "请输入物料编号!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialName()), "请输入物料名称!");
+        model.setValidFlag("0");
+        model.setCreateManNo(UserUtil.getCurrentUserId());
+        model.setCreateManName(UserUtil.getCurrentUserName());
+        model.setCreateTime(new Date());
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseStationMaterial dynamicBaseStationMaterial = dynamicBaseStationMaterialService.add(model);
+        return success(dynamicBaseStationMaterial);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasestationmaterial:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        DynamicBaseStationMaterial dynamicBaseStationMaterial = dynamicBaseStationMaterialService.getById(id);
+        return success(dynamicBaseStationMaterial);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的dynamicBaseStationMaterial信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "dynamicBaseStationMaterial", value = "详细实体dynamicBaseStationMaterial", required = true, dataType = "DynamicBaseStationMaterial")
+    })
+    //@RequiresPermissions("dynamicbasestationmaterial:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody DynamicBaseStationMaterial model){
+//        Assert.isTrue(StringUtils.isNotBlank(model.getStationNo()), "请输站点编号!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getStationName()), "请输入站点名称!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialNo()), "请输入物料编号!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialName()), "请输入物料名称!");
+        model.setId(id);
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
+        DynamicBaseStationMaterial dynamicBaseStationMaterial = dynamicBaseStationMaterialService.modify(model);
+        return success(dynamicBaseStationMaterial);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicbasestationmaterial: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);
+			  dynamicBaseStationMaterialService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value = "导出Excel", notes = "导出Excel")
+    @GetMapping(value = "/exportExcel")//String
+    public void exportExcel(HttpServletResponse response) throws IOException {
+        List<DynamicBaseStationMaterial> list = dynamicBaseStationMaterialService.query(null);
+        ExcelUtil.exportExcel(response, list, DynamicBaseStationMaterial.class, "动态秤站点物料信息");
+    }
+}

+ 9 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasestationmaterial/mapper/DynamicBaseStationMaterialMapper.java

@@ -0,0 +1,9 @@
+package com.jisco.dynamicweight.dynamicbasestationmaterial.mapper;
+
+import com.jisco.dynamicweight.dynamicbasestationmaterial.model.DynamicBaseStationMaterial;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DynamicBaseStationMaterialMapper extends IBaseMapper<DynamicBaseStationMaterial, String> {
+}

+ 420 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasestationmaterial/mapper/DynamicBaseStationMaterialMapper.xml

@@ -0,0 +1,420 @@
+<?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.jisco.dynamicweight.dynamicbasestationmaterial.mapper.DynamicBaseStationMaterialMapper">
+  <resultMap id="BaseResultMap" type="com.jisco.dynamicweight.dynamicbasestationmaterial.model.DynamicBaseStationMaterial">
+    <id column="STATION_MATERIAL_NO" jdbcType="VARCHAR" property="stationMaterialNo" />
+    <result column="STATION_NO" jdbcType="VARCHAR" property="stationNo" />
+    <result column="STATION_NAME" jdbcType="VARCHAR" property="stationName" />
+    <result column="MATERIAL_NO" jdbcType="VARCHAR" property="materialNo" />
+    <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <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" />
+  </resultMap>
+  <sql id="columns">
+    STATION_MATERIAL_NO, STATION_NO, STATION_NAME, MATERIAL_NO, MATERIAL_NAME, MEMO, 
+    VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+    UPDATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.STATION_MATERIAL_NO, t.STATION_NO, t.STATION_NAME, t.MATERIAL_NO, t.MATERIAL_NAME, 
+    t.MEMO, t.VALID_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, 
+    t.UPDATE_MAN_NAME, t.UPDATE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM DYNAMIC_BASE_STATION_MATERIAL
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DYNAMIC_BASE_STATION_MATERIAL t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="stationMaterialNo != null and stationMaterialNo != ''">
+        and STATION_MATERIAL_NO = #{stationMaterialNo}
+      </if>
+      <if test="stationNo != null and stationNo != ''">
+        and STATION_NO = #{stationNo}
+      </if>
+      <if test="stationName != null and stationName != ''">
+        and STATION_NAME = #{stationName}
+      </if>
+      <if test="materialNo != null and materialNo != ''">
+        and MATERIAL_NO = #{materialNo}
+      </if>
+      <if test="materialName != null and materialName != ''">
+        and MATERIAL_NAME = #{materialName}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="stationMaterialNo != null and stationMaterialNo != ''">
+        and STATION_MATERIAL_NO LIKE '%${stationMaterialNo}%'
+      </if>
+      <if test="stationNo != null and stationNo != ''">
+        and STATION_NO LIKE '%${stationNo}%'
+      </if>
+      <if test="stationName != null and stationName != ''">
+        and STATION_NAME LIKE '%${stationName}%'
+      </if>
+      <if test="materialNo != null and materialNo != ''">
+        and MATERIAL_NO LIKE '%${materialNo}%'
+      </if>
+      <if test="materialName != null and materialName != ''">
+        and MATERIAL_NAME LIKE '%${materialName}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from DYNAMIC_BASE_STATION_MATERIAL
+    where STATION_MATERIAL_NO = #{stationMaterialNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DYNAMIC_BASE_STATION_MATERIAL
+    where 1!=1 
+      <if test="stationNo != null and stationNo != ''">
+        or STATION_NO = #{stationNo}
+      </if>
+      <if test="stationName != null and stationName != ''">
+        or STATION_NAME = #{stationName}
+      </if>
+      <if test="materialNo != null and materialNo != ''">
+        or MATERIAL_NO = #{materialNo}
+      </if>
+      <if test="materialName != null and materialName != ''">
+        or MATERIAL_NAME = #{materialName}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.jisco.dynamicweight.dynamicbasestationmaterial.model.DynamicBaseStationMaterial">
+    insert into DYNAMIC_BASE_STATION_MATERIAL (STATION_MATERIAL_NO, STATION_NO, STATION_NAME, 
+      MATERIAL_NO, MATERIAL_NAME, MEMO, 
+      VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME)
+    values (#{stationMaterialNo,jdbcType=VARCHAR}, #{stationNo,jdbcType=VARCHAR}, #{stationName,jdbcType=VARCHAR}, 
+      #{materialNo,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
+      #{validFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.jisco.dynamicweight.dynamicbasestationmaterial.model.DynamicBaseStationMaterial">
+    insert into DYNAMIC_BASE_STATION_MATERIAL
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="stationMaterialNo != null">
+        STATION_MATERIAL_NO,
+      </if>
+      <if test="stationNo != null">
+        STATION_NO,
+      </if>
+      <if test="stationName != null">
+        STATION_NAME,
+      </if>
+      <if test="materialNo != null">
+        MATERIAL_NO,
+      </if>
+      <if test="materialName != null">
+        MATERIAL_NAME,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="stationMaterialNo != null">
+        #{stationMaterialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="stationNo != null">
+        #{stationNo,jdbcType=VARCHAR},
+      </if>
+      <if test="stationName != null">
+        #{stationName,jdbcType=VARCHAR},
+      </if>
+      <if test="materialNo != null">
+        #{materialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="materialName != null">
+        #{materialName,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.jisco.dynamicweight.dynamicbasestationmaterial.model.DynamicBaseStationMaterial">
+    update DYNAMIC_BASE_STATION_MATERIAL
+    set STATION_NO = #{stationNo,jdbcType=VARCHAR},
+      STATION_NAME = #{stationName,jdbcType=VARCHAR},
+      MATERIAL_NO = #{materialNo,jdbcType=VARCHAR},
+      MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,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}
+    where STATION_MATERIAL_NO = #{stationMaterialNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.jisco.dynamicweight.dynamicbasestationmaterial.model.DynamicBaseStationMaterial">
+    update DYNAMIC_BASE_STATION_MATERIAL
+    <set>
+      <if test="stationNo != null">
+        STATION_NO = #{stationNo,jdbcType=VARCHAR},
+      </if>
+      <if test="stationName != null">
+        STATION_NAME = #{stationName,jdbcType=VARCHAR},
+      </if>
+      <if test="materialNo != null">
+        MATERIAL_NO = #{materialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="materialName != null">
+        MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,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>
+    </set>
+    where STATION_MATERIAL_NO = #{stationMaterialNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where STATION_MATERIAL_NO = #{stationMaterialNo,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 DYNAMIC_BASE_STATION_MATERIAL 
+      (STATION_MATERIAL_NO, 
+      STATION_NO, STATION_NAME, MATERIAL_NO, 
+      MATERIAL_NAME, MEMO, VALID_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.stationMaterialNo,jdbcType=VARCHAR}, 
+      #{item.stationNo,jdbcType=VARCHAR}, #{item.stationName,jdbcType=VARCHAR}, #{item.materialNo,jdbcType=VARCHAR}, 
+      #{item.materialName,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,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}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update DYNAMIC_BASE_STATION_MATERIAL
+     set
+       STATION_MATERIAL_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_MATERIAL_NO" close="end">
+          when #{item.stationMaterialNo,jdbcType=VARCHAR} then #{item.stationMaterialNo,jdbcType=VARCHAR}
+       </foreach>
+       ,STATION_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_MATERIAL_NO" close="end">
+          when #{item.stationMaterialNo,jdbcType=VARCHAR} then #{item.stationNo,jdbcType=VARCHAR}
+       </foreach>
+       ,STATION_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_MATERIAL_NO" close="end">
+          when #{item.stationMaterialNo,jdbcType=VARCHAR} then #{item.stationName,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIAL_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_MATERIAL_NO" close="end">
+          when #{item.stationMaterialNo,jdbcType=VARCHAR} then #{item.materialNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIAL_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_MATERIAL_NO" close="end">
+          when #{item.stationMaterialNo,jdbcType=VARCHAR} then #{item.materialName,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_MATERIAL_NO" close="end">
+          when #{item.stationMaterialNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_MATERIAL_NO" close="end">
+          when #{item.stationMaterialNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_MATERIAL_NO" close="end">
+          when #{item.stationMaterialNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_MATERIAL_NO" close="end">
+          when #{item.stationMaterialNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_MATERIAL_NO" close="end">
+          when #{item.stationMaterialNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_MATERIAL_NO" close="end">
+          when #{item.stationMaterialNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_MATERIAL_NO" close="end">
+          when #{item.stationMaterialNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_MATERIAL_NO" close="end">
+          when #{item.stationMaterialNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where STATION_MATERIAL_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.stationMaterialNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DYNAMIC_BASE_STATION_MATERIAL
+    where STATION_MATERIAL_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 228 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasestationmaterial/model/DynamicBaseStationMaterial.java

@@ -0,0 +1,228 @@
+package com.jisco.dynamicweight.dynamicbasestationmaterial.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+@ApiModel(value="动态秤物料表")
+public class DynamicBaseStationMaterial implements IBasePO<String> {
+    /**
+     * 编号(ID)(STATION_MATERIAL_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="编号(ID)",required=true)
+    private String stationMaterialNo;
+
+    /**
+     * 站点编号(STATION_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="站点编号",required=false)
+    private String stationNo;
+
+    /**
+     * 站点名称(STATION_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="站点名称",required=false)
+    private String stationName;
+
+    /**
+     * 物料编号(MATERIAL_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物料编号",required=false)
+    private String materialNo;
+
+    /**
+     * 物料名称(MATERIAL_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="物料名称",required=false)
+    private String materialName;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 状态(0:无效;1:有效)(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0:无效;1:有效)",required=true)
+    private String validFlag;
+
+    /**
+     * 创建人编号(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;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.stationMaterialNo;
+    }
+
+    @Override
+    public void setId(String stationMaterialNo) {
+        this.stationMaterialNo = stationMaterialNo == null ? null : stationMaterialNo.trim();
+    }
+
+    public String getStationMaterialNo() {
+        return stationMaterialNo;
+    }
+
+    public void setStationMaterialNo(String stationMaterialNo) {
+        this.stationMaterialNo = stationMaterialNo == null ? null : stationMaterialNo.trim();
+    }
+
+    public String getStationNo() {
+        return stationNo;
+    }
+
+    public void setStationNo(String stationNo) {
+        this.stationNo = stationNo == null ? null : stationNo.trim();
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName == null ? null : stationName.trim();
+    }
+
+    public String getMaterialNo() {
+        return materialNo;
+    }
+
+    public void setMaterialNo(String materialNo) {
+        this.materialNo = materialNo == null ? null : materialNo.trim();
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName == null ? null : materialName.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", stationMaterialNo=").append(stationMaterialNo);
+        sb.append(", stationNo=").append(stationNo);
+        sb.append(", stationName=").append(stationName);
+        sb.append(", materialNo=").append(materialNo);
+        sb.append(", materialName=").append(materialName);
+        sb.append(", memo=").append(memo);
+        sb.append(", validFlag=").append(validFlag);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 21 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasestationmaterial/service/IDynamicBaseStationMaterialService.java

@@ -0,0 +1,21 @@
+package com.jisco.dynamicweight.dynamicbasestationmaterial.service;
+
+import com.jisco.dynamicweight.dynamicbasestationmaterial.model.DynamicBaseStationMaterial;
+import com.steerinfo.framework.service.IBaseService;
+
+/**
+ * DynamicBaseStationMaterial服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-06 05:25
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-06
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseStationMaterial服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IDynamicBaseStationMaterialService extends IBaseService<DynamicBaseStationMaterial, String>{
+
+}

+ 34 - 0
src/main/java/com/jisco/dynamicweight/dynamicbasestationmaterial/service/impl/DynamicBaseStationMaterialServiceImpl.java

@@ -0,0 +1,34 @@
+package com.jisco.dynamicweight.dynamicbasestationmaterial.service.impl;
+
+import com.jisco.dynamicweight.dynamicbasestationmaterial.mapper.DynamicBaseStationMaterialMapper;
+import com.jisco.dynamicweight.dynamicbasestationmaterial.model.DynamicBaseStationMaterial;
+import com.jisco.dynamicweight.dynamicbasestationmaterial.service.IDynamicBaseStationMaterialService;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * DynamicBaseStationMaterial服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-06 05:25
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-06
+ * 作者:generator
+ * 参考:
+ * 描述:DynamicBaseStationMaterial服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "dynamicBaseStationMaterialService")
+public class DynamicBaseStationMaterialServiceImpl extends BaseServiceImpl<DynamicBaseStationMaterial, String> implements IDynamicBaseStationMaterialService {
+
+    @Autowired
+    private DynamicBaseStationMaterialMapper dynamicBaseStationMaterialMapper;
+
+    @Override
+    protected IBaseMapper<DynamicBaseStationMaterial, String> getMapper() {
+        return dynamicBaseStationMaterialMapper;
+    }
+}

+ 44 - 0
src/main/java/com/jisco/dynamicweight/util/ExcelUtil.java

@@ -0,0 +1,44 @@
+package com.jisco.dynamicweight.util;
+
+import cn.hutool.poi.excel.ExcelWriter;
+import com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.URLEncoder;
+import java.util.List;
+
+public class ExcelUtil<T> {
+
+    public static void exportExcel(HttpServletResponse response, List list, Class clazz, String title) throws IOException {
+        ExcelWriter writer = cn.hutool.poi.excel.ExcelUtil.getBigWriter();
+        for (Field declaredField : clazz.getDeclaredFields()) {
+            ApiModelProperty annotation = declaredField.getAnnotation(ApiModelProperty.class);
+            if (annotation != null) {
+                writer.addHeaderAlias(declaredField.getName(), annotation.value());
+            }
+        }
+        writer.write(list, true);
+        //out为OutputStream,需要写出到的目标流
+        //response为HttpServletResponse对象
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        //test.xls是弹出下载对话框的文件名,不能为中文,中文请自行编码
+        String name = URLEncoder.encode(title, "UTF-8");
+        response.setHeader("Content-Disposition", "attachment;filename=" + name + ".xls");
+        ServletOutputStream out = null;
+        try {
+            out = response.getOutputStream();
+            writer.flush(out, true);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            // 关闭writer,释放内存
+            writer.close();
+            out.close();
+        }
+    }
+
+}

+ 18 - 0
src/main/java/com/jisco/dynamicweight/util/UserUtil.java

@@ -0,0 +1,18 @@
+package com.jisco.dynamicweight.util;
+
+import com.steerinfo.framework.user.UserPayload;
+import org.apache.commons.lang3.StringUtils;
+
+public class UserUtil {
+    public static String getCurrentUserId(){
+        UserPayload payload = UserPayload.getCurrUser();
+        String userId = payload.getId();
+        return userId;
+    }
+
+    public static String getCurrentUserName(){
+        UserPayload payload = UserPayload.getCurrUser();
+        String userName = payload.getUserName();
+        return userName;
+    }
+}

+ 1 - 2
src/main/java/com/steerinfo/SysManageApplication.java

@@ -34,7 +34,7 @@ import java.util.List;
 @RestController                                   // 在启动类中注入HttpMessageConverters
 @RestController                                   // 在启动类中注入HttpMessageConverters
 @MapperScan(basePackages = {"com.steerinfo.**","com.jisco.**"})
 @MapperScan(basePackages = {"com.steerinfo.**","com.jisco.**"})
 @ComponentScan(basePackages = {"com.steerinfo.**","com.jisco.**"})
 @ComponentScan(basePackages = {"com.steerinfo.**","com.jisco.**"})
-@ServletComponentScan(basePackages = {"com.steerinfo.filter"})
+@ServletComponentScan(basePackages = {"com.steerinfo.filter","com.jisco.filter"})
 @EnableCaching
 @EnableCaching
 @SpringBootApplication
 @SpringBootApplication
 @EnableSwagger2
 @EnableSwagger2
@@ -52,7 +52,6 @@ public class SysManageApplication implements WebMvcConfigurer {
 //		app.addListeners(new ContextRefreshedListener());
 //		app.addListeners(new ContextRefreshedListener());
         app.run(args);
         app.run(args);
 
 
-
         long endTime = System.currentTimeMillis();
         long endTime = System.currentTimeMillis();
         float excTime = (float) (endTime - startTime) / 1000;
         float excTime = (float) (endTime - startTime) / 1000;
         System.out.println("====================================>执行时间:" + excTime + "s");
         System.out.println("====================================>执行时间:" + excTime + "s");

+ 20 - 2
src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/controller/MeterBaseCarBlacelistController.java

@@ -77,7 +77,7 @@ public class MeterBaseCarBlacelistController extends BaseRESTfulController {
         }
         }
     }
     }
 
 
-    @ApiOperation(value = "创建", notes = "根据MeterBaseCarBlacelist对象创建")
+    @ApiOperation(value = "创建-网页", notes = "根据MeterBaseCarBlacelist对象创建")
     @ApiImplicitParam(name = "meterBaseCarBlacelist", value = "详细实体meterBaseCarBlacelist", required = true, dataType = "MeterBaseCarBlacelist")
     @ApiImplicitParam(name = "meterBaseCarBlacelist", value = "详细实体meterBaseCarBlacelist", required = true, dataType = "MeterBaseCarBlacelist")
     //@RequiresPermissions("meterbasecarblacelist:create")
     //@RequiresPermissions("meterbasecarblacelist:create")
     @Transactional
     @Transactional
@@ -152,7 +152,25 @@ public class MeterBaseCarBlacelistController extends BaseRESTfulController {
         }
         }
     }
     }
 
 
-    @ApiOperation(value = "启用", notes = "根据传过来的meterBaseCarBlacelist集合信息来更新详细信息")
+    @ApiOperation(value = "撤销-网页", notes = "根据传入实体来指定更新对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasecarblacelist:delete")
+    @PostMapping(value = "/cancel")//String
+    public RESTfulResult cancel(@RequestBody List<MeterBaseCarBlacelist> models) {
+        try {
+            String msg = meterBaseCarBlacelistService.cancel(models);
+            if (StringUtils.isNotEmpty(msg)) {
+                return failed(null, msg);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常,请确认!");
+        }
+        return success();
+    }
+
+    @ApiOperation(value = "启用-网页", notes = "根据传过来的meterBaseCarBlacelist集合信息来更新详细信息")
     @ApiImplicitParams({
     @ApiImplicitParams({
             @ApiImplicitParam(name = "meterBaseCarBlacelist", value = "详细实体meterBaseCarBlacelist", required = true, dataType = "meterBaseCarBlacelist")
             @ApiImplicitParam(name = "meterBaseCarBlacelist", value = "详细实体meterBaseCarBlacelist", required = true, dataType = "meterBaseCarBlacelist")
     })
     })

+ 324 - 198
src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/mapper/MeterBaseCarBlacelistMapper.xml

@@ -20,23 +20,30 @@
     <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
     <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
     <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
     <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
     <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
     <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
+    <result column="PUNISH_TYPE_NO" jdbcType="VARCHAR" property="punishTypeNo" />
+    <result column="PUNISH_TYPE_NAME" jdbcType="VARCHAR" property="punishTypeName" />
+    <result column="BLACK_LEVEL" jdbcType="VARCHAR" property="blackLevel" />
+    <result column="OPERATION_UNIT" jdbcType="VARCHAR" property="operationUnit" />
+    <result column="CHANGE_MEMO" jdbcType="VARCHAR" property="changeMemo" />
   </resultMap>
   </resultMap>
   <sql id="columns">
   <sql id="columns">
-    BLACELIST_NO, CAR_NO, CAR_OWNER_NAME, CAR_DRIVER_NAME, CAR_UNDER_UNIT, PUNISH_REASON, 
-    PUNISH_RESULT, VALUE_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
+    BLACELIST_NO, CAR_NO, CAR_OWNER_NAME, CAR_DRIVER_NAME, CAR_UNDER_UNIT, PUNISH_REASON,
+    PUNISH_RESULT, VALUE_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, PUNISH_TYPE_NO,
+    PUNISH_TYPE_NAME, BLACK_LEVEL, OPERATION_UNIT, CHANGE_MEMO
   </sql>
   </sql>
   <sql id="columns_alias">
   <sql id="columns_alias">
-    t.BLACELIST_NO, t.CAR_NO, t.CAR_OWNER_NAME, t.CAR_DRIVER_NAME, t.CAR_UNDER_UNIT, 
-    t.PUNISH_REASON, t.PUNISH_RESULT, t.VALUE_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
+    t.BLACELIST_NO, t.CAR_NO, t.CAR_OWNER_NAME, t.CAR_DRIVER_NAME, t.CAR_UNDER_UNIT,
+    t.PUNISH_REASON, t.PUNISH_RESULT, t.VALUE_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, t.PUNISH_TYPE_NO, t.PUNISH_TYPE_NAME, t.BLACK_LEVEL,
+    t.OPERATION_UNIT, t.CHANGE_MEMO
   </sql>
   </sql>
   <sql id="select">
   <sql id="select">
-    SELECT <include refid="columns"/> FROM METER_BASE_CAR_BLACELIST
+    SELECT <include refid="columns" /> FROM METER_BASE_CAR_BLACELIST
   </sql>
   </sql>
   <sql id="select_alias">
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM METER_BASE_CAR_BLACELIST t
+    SELECT <include refid="columns_alias" /> FROM METER_BASE_CAR_BLACELIST t
   </sql>
   </sql>
   <sql id="where">
   <sql id="where">
     <where>
     <where>
@@ -94,6 +101,21 @@
       <if test="deleteTime != null">
       <if test="deleteTime != null">
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
       </if>
       </if>
+      <if test="punishTypeNo != null and punishTypeNo != ''">
+        and PUNISH_TYPE_NO = #{punishTypeNo}
+      </if>
+      <if test="punishTypeName != null and punishTypeName != ''">
+        and PUNISH_TYPE_NAME = #{punishTypeName}
+      </if>
+      <if test="blackLevel != null and blackLevel != ''">
+        and BLACK_LEVEL = #{blackLevel}
+      </if>
+      <if test="operationUnit != null and operationUnit != ''">
+        and OPERATION_UNIT = #{operationUnit}
+      </if>
+      <if test="changeMemo != null and changeMemo != ''">
+        and CHANGE_MEMO = #{changeMemo}
+      </if>
     </where>
     </where>
   </sql>
   </sql>
   <sql id="whereLike">
   <sql id="whereLike">
@@ -152,6 +174,21 @@
       <if test="deleteTime != null">
       <if test="deleteTime != null">
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
       </if>
       </if>
+      <if test="punishTypeNo != null and punishTypeNo != ''">
+        and PUNISH_TYPE_NO LIKE '%${punishTypeNo}%'
+      </if>
+      <if test="punishTypeName != null and punishTypeName != ''">
+        and PUNISH_TYPE_NAME LIKE '%${punishTypeName}%'
+      </if>
+      <if test="blackLevel != null and blackLevel != ''">
+        and BLACK_LEVEL LIKE '%${blackLevel}%'
+      </if>
+      <if test="operationUnit != null and operationUnit != ''">
+        and OPERATION_UNIT LIKE '%${operationUnit}%'
+      </if>
+      <if test="changeMemo != null and changeMemo != ''">
+        and CHANGE_MEMO LIKE '%${changeMemo}%'
+      </if>
     </where>
     </where>
   </sql>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -160,74 +197,91 @@
   </delete>
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_BASE_CAR_BLACELIST
     delete from METER_BASE_CAR_BLACELIST
-    where 1!=1 
-      <if test="carNo != null and carNo != ''">
-        or CAR_NO = #{carNo}
-      </if>
-      <if test="carOwnerName != null and carOwnerName != ''">
-        or CAR_OWNER_NAME = #{carOwnerName}
-      </if>
-      <if test="carDriverName != null and carDriverName != ''">
-        or CAR_DRIVER_NAME = #{carDriverName}
-      </if>
-      <if test="carUnderUnit != null and carUnderUnit != ''">
-        or CAR_UNDER_UNIT = #{carUnderUnit}
-      </if>
-      <if test="punishReason != null and punishReason != ''">
-        or PUNISH_REASON = #{punishReason}
-      </if>
-      <if test="punishResult != null and punishResult != ''">
-        or PUNISH_RESULT = #{punishResult}
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        or VALUE_FLAG = #{valueFlag}
-      </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>
+    where 1!=1
+    <if test="carNo != null and carNo != ''">
+      or CAR_NO = #{carNo}
+    </if>
+    <if test="carOwnerName != null and carOwnerName != ''">
+      or CAR_OWNER_NAME = #{carOwnerName}
+    </if>
+    <if test="carDriverName != null and carDriverName != ''">
+      or CAR_DRIVER_NAME = #{carDriverName}
+    </if>
+    <if test="carUnderUnit != null and carUnderUnit != ''">
+      or CAR_UNDER_UNIT = #{carUnderUnit}
+    </if>
+    <if test="punishReason != null and punishReason != ''">
+      or PUNISH_REASON = #{punishReason}
+    </if>
+    <if test="punishResult != null and punishResult != ''">
+      or PUNISH_RESULT = #{punishResult}
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      or VALUE_FLAG = #{valueFlag}
+    </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>
+    <if test="punishTypeNo != null and punishTypeNo != ''">
+      or PUNISH_TYPE_NO = #{punishTypeNo}
+    </if>
+    <if test="punishTypeName != null and punishTypeName != ''">
+      or PUNISH_TYPE_NAME = #{punishTypeName}
+    </if>
+    <if test="blackLevel != null and blackLevel != ''">
+      or BLACK_LEVEL = #{blackLevel}
+    </if>
+    <if test="operationUnit != null and operationUnit != ''">
+      or OPERATION_UNIT = #{operationUnit}
+    </if>
+    <if test="changeMemo != null and changeMemo != ''">
+      or CHANGE_MEMO = #{changeMemo}
+    </if>
   </delete>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist">
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist">
-    insert into METER_BASE_CAR_BLACELIST (BLACELIST_NO, CAR_NO, CAR_OWNER_NAME, 
-      CAR_DRIVER_NAME, CAR_UNDER_UNIT, PUNISH_REASON, 
-      PUNISH_RESULT, VALUE_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 (#{blacelistNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{carOwnerName,jdbcType=VARCHAR}, 
-      #{carDriverName,jdbcType=VARCHAR}, #{carUnderUnit,jdbcType=VARCHAR}, #{punishReason,jdbcType=VARCHAR}, 
-      #{punishResult,jdbcType=VARCHAR}, #{valueFlag,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 into METER_BASE_CAR_BLACELIST (BLACELIST_NO, CAR_NO, CAR_OWNER_NAME,
+                                          CAR_DRIVER_NAME, CAR_UNDER_UNIT, PUNISH_REASON,
+                                          PUNISH_RESULT, VALUE_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,
+                                          PUNISH_TYPE_NO, PUNISH_TYPE_NAME, BLACK_LEVEL,
+                                          OPERATION_UNIT, CHANGE_MEMO)
+    values (#{blacelistNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{carOwnerName,jdbcType=VARCHAR},
+            #{carDriverName,jdbcType=VARCHAR}, #{carUnderUnit,jdbcType=VARCHAR}, #{punishReason,jdbcType=VARCHAR},
+            #{punishResult,jdbcType=VARCHAR}, #{valueFlag,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},
+            #{punishTypeNo,jdbcType=VARCHAR}, #{punishTypeName,jdbcType=VARCHAR}, #{blackLevel,jdbcType=VARCHAR},
+            #{operationUnit,jdbcType=VARCHAR}, #{changeMemo,jdbcType=VARCHAR})
   </insert>
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist">
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist">
     insert into METER_BASE_CAR_BLACELIST
     insert into METER_BASE_CAR_BLACELIST
@@ -286,6 +340,21 @@
       <if test="deleteTime != null">
       <if test="deleteTime != null">
         DELETE_TIME,
         DELETE_TIME,
       </if>
       </if>
+      <if test="punishTypeNo != null">
+        PUNISH_TYPE_NO,
+      </if>
+      <if test="punishTypeName != null">
+        PUNISH_TYPE_NAME,
+      </if>
+      <if test="blackLevel != null">
+        BLACK_LEVEL,
+      </if>
+      <if test="operationUnit != null">
+        OPERATION_UNIT,
+      </if>
+      <if test="changeMemo != null">
+        CHANGE_MEMO,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="blacelistNo != null">
       <if test="blacelistNo != null">
@@ -342,27 +411,47 @@
       <if test="deleteTime != null">
       <if test="deleteTime != null">
         #{deleteTime,jdbcType=TIMESTAMP},
         #{deleteTime,jdbcType=TIMESTAMP},
       </if>
       </if>
+      <if test="punishTypeNo != null">
+        #{punishTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="punishTypeName != null">
+        #{punishTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="blackLevel != null">
+        #{blackLevel,jdbcType=VARCHAR},
+      </if>
+      <if test="operationUnit != null">
+        #{operationUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="changeMemo != null">
+        #{changeMemo,jdbcType=VARCHAR},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist">
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist">
     update METER_BASE_CAR_BLACELIST
     update METER_BASE_CAR_BLACELIST
     set CAR_NO = #{carNo,jdbcType=VARCHAR},
     set CAR_NO = #{carNo,jdbcType=VARCHAR},
-      CAR_OWNER_NAME = #{carOwnerName,jdbcType=VARCHAR},
-      CAR_DRIVER_NAME = #{carDriverName,jdbcType=VARCHAR},
-      CAR_UNDER_UNIT = #{carUnderUnit,jdbcType=VARCHAR},
-      PUNISH_REASON = #{punishReason,jdbcType=VARCHAR},
-      PUNISH_RESULT = #{punishResult,jdbcType=VARCHAR},
-      VALUE_FLAG = #{valueFlag,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}
+        CAR_OWNER_NAME = #{carOwnerName,jdbcType=VARCHAR},
+        CAR_DRIVER_NAME = #{carDriverName,jdbcType=VARCHAR},
+        CAR_UNDER_UNIT = #{carUnderUnit,jdbcType=VARCHAR},
+        PUNISH_REASON = #{punishReason,jdbcType=VARCHAR},
+        PUNISH_RESULT = #{punishResult,jdbcType=VARCHAR},
+        VALUE_FLAG = #{valueFlag,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},
+        PUNISH_TYPE_NO = #{punishTypeNo,jdbcType=VARCHAR},
+        PUNISH_TYPE_NAME = #{punishTypeName,jdbcType=VARCHAR},
+        BLACK_LEVEL = #{blackLevel,jdbcType=VARCHAR},
+        OPERATION_UNIT = #{operationUnit,jdbcType=VARCHAR},
+        CHANGE_MEMO = #{changeMemo,jdbcType=VARCHAR}
     where BLACELIST_NO = #{blacelistNo,jdbcType=VARCHAR}
     where BLACELIST_NO = #{blacelistNo,jdbcType=VARCHAR}
   </update>
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist">
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist">
@@ -419,129 +508,166 @@
       <if test="deleteTime != null">
       <if test="deleteTime != null">
         DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
         DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
       </if>
       </if>
+      <if test="punishTypeNo != null">
+        PUNISH_TYPE_NO = #{punishTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="punishTypeName != null">
+        PUNISH_TYPE_NAME = #{punishTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="blackLevel != null">
+        BLACK_LEVEL = #{blackLevel,jdbcType=VARCHAR},
+      </if>
+      <if test="operationUnit != null">
+        OPERATION_UNIT = #{operationUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="changeMemo != null">
+        CHANGE_MEMO = #{changeMemo,jdbcType=VARCHAR},
+      </if>
     </set>
     </set>
     where BLACELIST_NO = #{blacelistNo,jdbcType=VARCHAR}
     where BLACELIST_NO = #{blacelistNo,jdbcType=VARCHAR}
   </update>
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
+    <include refid="select" />
     where BLACELIST_NO = #{blacelistNo,jdbcType=VARCHAR}
     where BLACELIST_NO = #{blacelistNo,jdbcType=VARCHAR}
   </select>
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-    order by  BLACELIST_NO desc
+    <include refid="select" />
+    <include refid="where" />
   </select>
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-    order by  BLACELIST_NO desc
+    <include refid="select" />
+    <include refid="whereLike" />
   </select>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_BASE_CAR_BLACELIST 
-      (BLACELIST_NO, 
-      CAR_NO, CAR_OWNER_NAME, CAR_DRIVER_NAME, 
-      CAR_UNDER_UNIT, PUNISH_REASON, PUNISH_RESULT, 
-      VALUE_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.blacelistNo,jdbcType=VARCHAR}, 
-      #{item.carNo,jdbcType=VARCHAR}, #{item.carOwnerName,jdbcType=VARCHAR}, #{item.carDriverName,jdbcType=VARCHAR}, 
-      #{item.carUnderUnit,jdbcType=VARCHAR}, #{item.punishReason,jdbcType=VARCHAR}, #{item.punishResult,jdbcType=VARCHAR}, 
-      #{item.valueFlag,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 into METER_BASE_CAR_BLACELIST
+    (BLACELIST_NO,
+    CAR_NO, CAR_OWNER_NAME, CAR_DRIVER_NAME,
+    CAR_UNDER_UNIT, PUNISH_REASON, PUNISH_RESULT,
+    VALUE_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,
+    PUNISH_TYPE_NO, PUNISH_TYPE_NAME,
+    BLACK_LEVEL, OPERATION_UNIT, CHANGE_MEMO
+    )
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.blacelistNo,jdbcType=VARCHAR},
+    #{item.carNo,jdbcType=VARCHAR}, #{item.carOwnerName,jdbcType=VARCHAR}, #{item.carDriverName,jdbcType=VARCHAR},
+    #{item.carUnderUnit,jdbcType=VARCHAR}, #{item.punishReason,jdbcType=VARCHAR}, #{item.punishResult,jdbcType=VARCHAR},
+    #{item.valueFlag,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},
+    #{item.punishTypeNo,jdbcType=VARCHAR}, #{item.punishTypeName,jdbcType=VARCHAR},
+    #{item.blackLevel,jdbcType=VARCHAR}, #{item.operationUnit,jdbcType=VARCHAR}, #{item.changeMemo,jdbcType=VARCHAR}
+    from dual
+  </foreach> )
   </insert>
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
   <update id="batchUpdate" parameterType="java.util.List">
-     update METER_BASE_CAR_BLACELIST
-     set
-       BLACELIST_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.blacelistNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CAR_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CAR_OWNER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carOwnerName,jdbcType=VARCHAR}
-       </foreach>
-       ,CAR_DRIVER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carDriverName,jdbcType=VARCHAR}
-       </foreach>
-       ,CAR_UNDER_UNIT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carUnderUnit,jdbcType=VARCHAR}
-       </foreach>
-       ,PUNISH_REASON=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishReason,jdbcType=VARCHAR}
-       </foreach>
-       ,PUNISH_RESULT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishResult,jdbcType=VARCHAR}
-       </foreach>
-       ,VALUE_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
-       </foreach>
-       ,MEMO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,DELETE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
-       </foreach>
-     where BLACELIST_NO in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.blacelistNo,jdbcType=VARCHAR}
-     </foreach> 
+    update METER_BASE_CAR_BLACELIST
+    set
+    BLACELIST_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.blacelistNo,jdbcType=VARCHAR}
+    </foreach>
+    ,CAR_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+    </foreach>
+    ,CAR_OWNER_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carOwnerName,jdbcType=VARCHAR}
+    </foreach>
+    ,CAR_DRIVER_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carDriverName,jdbcType=VARCHAR}
+    </foreach>
+    ,CAR_UNDER_UNIT=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carUnderUnit,jdbcType=VARCHAR}
+    </foreach>
+    ,PUNISH_REASON=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishReason,jdbcType=VARCHAR}
+    </foreach>
+    ,PUNISH_RESULT=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishResult,jdbcType=VARCHAR}
+    </foreach>
+    ,VALUE_FLAG=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+    </foreach>
+    ,MEMO=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+    </foreach>
+    ,CREATE_MAN_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+    </foreach>
+    ,CREATE_MAN_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+    </foreach>
+    ,CREATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_MAN_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_MAN_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,DELETE_MAN_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETE_MAN_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,PUNISH_TYPE_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishTypeNo,jdbcType=VARCHAR}
+    </foreach>
+    ,PUNISH_TYPE_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishTypeName,jdbcType=VARCHAR}
+    </foreach>
+    ,BLACK_LEVEL=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.blackLevel,jdbcType=VARCHAR}
+    </foreach>
+    ,OPERATION_UNIT=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.operationUnit,jdbcType=VARCHAR}
+    </foreach>
+    ,CHANGE_MEMO=
+    <foreach close="end" collection="list" index="index" item="item" open="case BLACELIST_NO" separator=" ">
+      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.changeMemo,jdbcType=VARCHAR}
+    </foreach>
+    where BLACELIST_NO in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.blacelistNo,jdbcType=VARCHAR}
+    </foreach>
   </update>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_BASE_CAR_BLACELIST
     delete from METER_BASE_CAR_BLACELIST
-    where BLACELIST_NO in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
+    where BLACELIST_NO in
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
       #{id}
     </foreach>
     </foreach>
   </delete>
   </delete>

+ 75 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/model/MeterBaseCarBlacelist.java

@@ -113,6 +113,36 @@ public class MeterBaseCarBlacelist implements IBasePO<String> {
     @ApiModelProperty(value="删除时间",required=false)
     @ApiModelProperty(value="删除时间",required=false)
     private Date deleteTime;
     private Date deleteTime;
 
 
+    /**
+     * 违规类型编号(PUNISH_TYPE_NO,VARCHAR,30)
+     */
+    @ApiModelProperty(value="违规类型编号",required=false)
+    private String punishTypeNo;
+
+    /**
+     * 违规类型名称(PUNISH_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="违规类型名称",required=false)
+    private String punishTypeName;
+
+    /**
+     * 黑名单级别(BLACK_LEVEL,VARCHAR,30)
+     */
+    @ApiModelProperty(value="黑名单级别",required=false)
+    private String blackLevel;
+
+    /**
+     * 操作部门(OPERATION_UNIT,VARCHAR,50)
+     */
+    @ApiModelProperty(value="操作部门",required=false)
+    private String operationUnit;
+
+    /**
+     * 黑名单级别更改备注(CHANGE_MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="黑名单级别更改备注",required=false)
+    private String changeMemo;
+
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Override
     @Override
@@ -269,6 +299,46 @@ public class MeterBaseCarBlacelist implements IBasePO<String> {
         this.deleteTime = deleteTime;
         this.deleteTime = deleteTime;
     }
     }
 
 
+    public String getPunishTypeNo() {
+        return punishTypeNo;
+    }
+
+    public void setPunishTypeNo(String punishTypeNo) {
+        this.punishTypeNo = punishTypeNo == null ? null : punishTypeNo.trim();
+    }
+
+    public String getPunishTypeName() {
+        return punishTypeName;
+    }
+
+    public void setPunishTypeName(String punishTypeName) {
+        this.punishTypeName = punishTypeName == null ? null : punishTypeName.trim();
+    }
+
+    public String getBlackLevel() {
+        return blackLevel;
+    }
+
+    public void setBlackLevel(String blackLevel) {
+        this.blackLevel = blackLevel == null ? null : blackLevel.trim();
+    }
+
+    public String getOperationUnit() {
+        return operationUnit;
+    }
+
+    public void setOperationUnit(String operationUnit) {
+        this.operationUnit = operationUnit == null ? null : operationUnit.trim();
+    }
+
+    public String getChangeMemo() {
+        return changeMemo;
+    }
+
+    public void setChangeMemo(String changeMemo) {
+        this.changeMemo = changeMemo == null ? null : changeMemo.trim();
+    }
+
     @Override
     @Override
     public String toString() {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         StringBuilder sb = new StringBuilder();
@@ -293,6 +363,11 @@ public class MeterBaseCarBlacelist implements IBasePO<String> {
         sb.append(", deleteManNo=").append(deleteManNo);
         sb.append(", deleteManNo=").append(deleteManNo);
         sb.append(", deleteManName=").append(deleteManName);
         sb.append(", deleteManName=").append(deleteManName);
         sb.append(", deleteTime=").append(deleteTime);
         sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", punishTypeNo=").append(punishTypeNo);
+        sb.append(", punishTypeName=").append(punishTypeName);
+        sb.append(", blackLevel=").append(blackLevel);
+        sb.append(", operationUnit=").append(operationUnit);
+        sb.append(", changeMemo=").append(changeMemo);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         sb.append("]");
         return sb.toString();
         return sb.toString();

+ 2 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/service/IMeterBaseCarBlacelistService.java

@@ -23,6 +23,8 @@ public interface IMeterBaseCarBlacelistService extends IBaseService<MeterBaseCar
 
 
      String Recovery(List<MeterBaseCarBlacelist> models);
      String Recovery(List<MeterBaseCarBlacelist> models);
 
 
+     String cancel(List<MeterBaseCarBlacelist> models);
+
      String checkandupdate(String id,MeterBaseCarBlacelist model);
      String checkandupdate(String id,MeterBaseCarBlacelist model);
 
 
      String abolish(List<MeterBaseCarBlacelist> models);
      String abolish(List<MeterBaseCarBlacelist> models);

+ 30 - 4
src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/service/impl/MeterBaseCarBlacelistServiceImpl.java

@@ -48,7 +48,7 @@ public class MeterBaseCarBlacelistServiceImpl extends BaseServiceImpl<MeterBaseC
         }
         }
         HashMap<String, Object> obj = new HashMap<>();
         HashMap<String, Object> obj = new HashMap<>();
         obj.put("carNo", model.getCarNo());
         obj.put("carNo", model.getCarNo());
-        obj.put("valueFlag","0");
+        obj.put("valueFlag","1");
         List<MeterBaseCarBlacelist> com =meterBaseCarBlacelistMapper.selectByParameters(obj);
         List<MeterBaseCarBlacelist> com =meterBaseCarBlacelistMapper.selectByParameters(obj);
         if( !com.isEmpty()) {
         if( !com.isEmpty()) {
             return "该车号已存在有效的黑名单数据!";
             return "该车号已存在有效的黑名单数据!";
@@ -68,7 +68,30 @@ public class MeterBaseCarBlacelistServiceImpl extends BaseServiceImpl<MeterBaseC
             }
             }
             for (MeterBaseCarBlacelist model:models) {
             for (MeterBaseCarBlacelist model:models) {
                 model.setId(model.getId());
                 model.setId(model.getId());
-                model.setValueFlag("0");
+                model.setValueFlag("1");
+                model.setUpdateManName(model.getUpdateManName());
+                model.setUpdateManNo(model.getUpdateManNo());
+                model.setUpdateTime(new Date());
+                meterBaseCarBlacelistMapper.updateByPrimaryKey(model);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return "操作异常,请联系管理员";
+        }
+        return "";
+    }
+
+    @Override
+    public String cancel(List<MeterBaseCarBlacelist> models)
+    {
+        try {
+            if (models == null || models.size() < 1) {
+                return "请传入参数!";
+            }
+            for (MeterBaseCarBlacelist model:models) {
+                model.setId(model.getId());
+                model.setValueFlag("2"); // 设置为撤销状态
                 model.setUpdateManName(model.getUpdateManName());
                 model.setUpdateManName(model.getUpdateManName());
                 model.setUpdateManNo(model.getUpdateManNo());
                 model.setUpdateManNo(model.getUpdateManNo());
                 model.setUpdateTime(new Date());
                 model.setUpdateTime(new Date());
@@ -110,7 +133,7 @@ public class MeterBaseCarBlacelistServiceImpl extends BaseServiceImpl<MeterBaseC
             }
             }
             for (MeterBaseCarBlacelist model:models) {
             for (MeterBaseCarBlacelist model:models) {
                 model.setId(model.getId());
                 model.setId(model.getId());
-                model.setValueFlag("1");
+                model.setValueFlag("0");
                 model.setUpdateManName(model.getUpdateManName());
                 model.setUpdateManName(model.getUpdateManName());
                 model.setUpdateManNo(model.getUpdateManNo());
                 model.setUpdateManNo(model.getUpdateManNo());
                 model.setUpdateTime(new Date());
                 model.setUpdateTime(new Date());
@@ -141,6 +164,9 @@ public class MeterBaseCarBlacelistServiceImpl extends BaseServiceImpl<MeterBaseC
         if (StringUtils.isEmpty(model.getCarUnderUnit())){
         if (StringUtils.isEmpty(model.getCarUnderUnit())){
             return "隶属单位不能为空!!";
             return "隶属单位不能为空!!";
         }
         }
+        if (StringUtils.isEmpty(model.getCreateManNo())){
+            return "创建人标号不能为空!!";
+        }
         if (StringUtils.isEmpty(model.getPunishReason())){
         if (StringUtils.isEmpty(model.getPunishReason())){
             return "处罚原因不能为空!!";
             return "处罚原因不能为空!!";
         }
         }
@@ -149,7 +175,7 @@ public class MeterBaseCarBlacelistServiceImpl extends BaseServiceImpl<MeterBaseC
         }
         }
         if(StringUtils.isEmpty(model.getBlacelistNo())){
         if(StringUtils.isEmpty(model.getBlacelistNo())){
             model.setCreateTime(new Date());
             model.setCreateTime(new Date());
-            model.setValueFlag("0");
+            model.setValueFlag("1");
         }else {
         }else {
             model.setUpdateTime(new Date());
             model.setUpdateTime(new Date());
         }
         }

+ 13 - 13
src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -171,16 +171,16 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 throw new MarkerMetException(500, "皮重重量大于毛重重量!!");
                 throw new MarkerMetException(500, "皮重重量大于毛重重量!!");
             }
             }
 
 
-            //修改预环节信息;不等于 中控倒运 001006003
-            if (!mwcaf1.getMeterTypeNo().equals("001006003")) {
-                List<MeterWorkPreLink> mwpls = meterWorkPreLinkService.getPer(mwcaf1.getPredictionNo(), DbConstants.CLEAN);
-                for (MeterWorkPreLink mwpl : mwpls) {
-                    mwpl.setValueFlag("1");//已使用
-                    mwpl.setUpdateManName("system");
-                    mwpl.setUpdateManName("二次计量洁净更新");
-                    mwpl.setUpdateTime(new Date());
-                    meterWorkPreLinkMapper.updateByPrimaryKey(mwpl);
-                }
+            //修改预环节信息;不等于 中控倒运 001006003 --- 注释业务类型判断以及对预环节的处理
+//            if (!mwcaf1.getMeterTypeNo().equals("001006003")) {
+//                List<MeterWorkPreLink> mwpls = meterWorkPreLinkService.getPer(mwcaf1.getPredictionNo(), DbConstants.CLEAN);
+//                for (MeterWorkPreLink mwpl : mwpls) {
+//                    mwpl.setValueFlag("1");//已使用
+//                    mwpl.setUpdateManName("system");
+//                    mwpl.setUpdateManName("二次计量洁净更新");
+//                    mwpl.setUpdateTime(new Date());
+//                    meterWorkPreLinkMapper.updateByPrimaryKey(mwpl);
+//                }
                 //修改预报
                 //修改预报
                 if (StringUtils.isNotEmpty(mwcaf1.getPredictionNo())
                 if (StringUtils.isNotEmpty(mwcaf1.getPredictionNo())
                         && mwcaf1.getPredictionNo().length() > 10) {
                         && mwcaf1.getPredictionNo().length() > 10) {
@@ -192,15 +192,15 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     scale.setUpdateManName("二次计量洁净更新");
                     scale.setUpdateManName("二次计量洁净更新");
                     preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                     preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                 }
                 }
-            }
-
+//            }
 
 
+            // 毛重数据处理
             mwcaf1.setValueFlag(DbConstants.NET);
             mwcaf1.setValueFlag(DbConstants.NET);
             mwcaf1.setUpdateManName("system");
             mwcaf1.setUpdateManName("system");
             mwcaf1.setUpdateManName("二次计量洁净更新");
             mwcaf1.setUpdateManName("二次计量洁净更新");
             mwcaf1.setUpdateTime(new Date());
             mwcaf1.setUpdateTime(new Date());
             meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf1);
             meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf1);
-
+            // 皮重数据处理
             mwcaf2.setValueFlag(DbConstants.NET);
             mwcaf2.setValueFlag(DbConstants.NET);
             mwcaf2.setUpdateManName("system");
             mwcaf2.setUpdateManName("system");
             mwcaf2.setUpdateManName("二次计量洁净更新");
             mwcaf2.setUpdateManName("二次计量洁净更新");

+ 4 - 0
src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -427,6 +427,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     meterWorkPreLinkMapper.updateByPrimaryKey(mwpl);
                     meterWorkPreLinkMapper.updateByPrimaryKey(mwpl);
                 }
                 }
                 MeterWorkCarActualFirst mwcaf = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirstNo());
                 MeterWorkCarActualFirst mwcaf = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirstNo());
+                // 将一次计量数据设置为未匹配状态
+                mwcaf.setValueFlag("3");
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf);
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf);
                 num++;
                 num++;
             }
             }
@@ -488,6 +490,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             pts.setUpdateManName("一次计量数据匹配操作");
             pts.setUpdateManName("一次计量数据匹配操作");
             pts.setValueFlag(DbConstants.IN); //2021年5月24日  预报直接就写成【使用中】
             pts.setValueFlag(DbConstants.IN); //2021年5月24日  预报直接就写成【使用中】
             preTrackScaleMapper.updateByPrimaryKey(pts);
             preTrackScaleMapper.updateByPrimaryKey(pts);
+            // 设置为已匹配状态
+            model.setValueFlag("1");
             meterWorkCarActualFirstMapper.updateByPrimaryKey(model);
             meterWorkCarActualFirstMapper.updateByPrimaryKey(model);
             return model;
             return model;
         } catch (MarkerMetException e) {
         } catch (MarkerMetException e) {