Ver código fonte

提交修改

xieb 4 anos atrás
pai
commit
f5a323c3cd
20 arquivos alterados com 1946 adições e 2 exclusões
  1. 110 0
      src/main/java/com/steerinfo/baseinfo/appversionmsg/controller/AppVersionMsgController.java
  2. 10 0
      src/main/java/com/steerinfo/baseinfo/appversionmsg/mapper/AppVersionMsgMapper.java
  3. 212 0
      src/main/java/com/steerinfo/baseinfo/appversionmsg/mapper/AppVersionMsgMapper.xml
  4. 106 0
      src/main/java/com/steerinfo/baseinfo/appversionmsg/model/AppVersionMsg.java
  5. 23 0
      src/main/java/com/steerinfo/baseinfo/appversionmsg/service/IAppVersionMsgService.java
  6. 36 0
      src/main/java/com/steerinfo/baseinfo/appversionmsg/service/impl/AppVersionMsgServiceImpl.java
  7. 1 1
      src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java
  8. 110 0
      src/main/java/com/steerinfo/meterwork/meterworknotice/controller/MeterWorkNoticeController.java
  9. 10 0
      src/main/java/com/steerinfo/meterwork/meterworknotice/mapper/MeterWorkNoticeMapper.java
  10. 395 0
      src/main/java/com/steerinfo/meterwork/meterworknotice/mapper/MeterWorkNoticeMapper.xml
  11. 211 0
      src/main/java/com/steerinfo/meterwork/meterworknotice/model/MeterWorkNotice.java
  12. 23 0
      src/main/java/com/steerinfo/meterwork/meterworknotice/service/IMeterWorkNoticeService.java
  13. 36 0
      src/main/java/com/steerinfo/meterwork/meterworknotice/service/impl/MeterWorkNoticeServiceImpl.java
  14. 110 0
      src/main/java/com/steerinfo/meterwork/meterworktask/controller/MeterWorkTaskController.java
  15. 10 0
      src/main/java/com/steerinfo/meterwork/meterworktask/mapper/MeterWorkTaskMapper.java
  16. 316 0
      src/main/java/com/steerinfo/meterwork/meterworktask/mapper/MeterWorkTaskMapper.xml
  17. 167 0
      src/main/java/com/steerinfo/meterwork/meterworktask/model/MeterWorkTask.java
  18. 23 0
      src/main/java/com/steerinfo/meterwork/meterworktask/service/IMeterWorkTaskService.java
  19. 36 0
      src/main/java/com/steerinfo/meterwork/meterworktask/service/impl/MeterWorkTaskServiceImpl.java
  20. 1 1
      src/main/java/com/steerinfo/pretrack/pretrackscale/controller/PreTrackScaleController.java

+ 110 - 0
src/main/java/com/steerinfo/baseinfo/appversionmsg/controller/AppVersionMsgController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.baseinfo.appversionmsg.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg;
+import com.steerinfo.baseinfo.appversionmsg.service.IAppVersionMsgService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * AppVersionMsg RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-22 09:58
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-22
+ * 作者:generator
+ * 参考:
+ * 描述:AppVersionMsg RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/appversionmsgs")
+public class AppVersionMsgController extends BaseRESTfulController {
+
+    @Autowired
+    IAppVersionMsgService appVersionMsgService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("appversionmsg:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<AppVersionMsg> list = appVersionMsgService.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("appversionmsg:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<AppVersionMsg> list = appVersionMsgService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据AppVersionMsg对象创建")
+    @ApiImplicitParam(name = "appVersionMsg", value = "详细实体appVersionMsg", required = true, dataType = "AppVersionMsg")
+    //@RequiresPermissions("appversionmsg:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute AppVersionMsg model){
+        AppVersionMsg appVersionMsg = appVersionMsgService.add(model);
+        return success(appVersionMsg);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("appversionmsg:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        AppVersionMsg appVersionMsg = appVersionMsgService.getById(id);
+        return success(appVersionMsg);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的appVersionMsg信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "appVersionMsg", value = "详细实体appVersionMsg", required = true, dataType = "AppVersionMsg")
+    })
+    //@RequiresPermissions("appversionmsg:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody AppVersionMsg model){
+        model.setId(id);
+        AppVersionMsg appVersionMsg = appVersionMsgService.modify(model);
+        return success(appVersionMsg);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("appversionmsg: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);
+			  appVersionMsgService.delete(ids);
+    	}
+      return success();
+    }
+}

+ 10 - 0
src/main/java/com/steerinfo/baseinfo/appversionmsg/mapper/AppVersionMsgMapper.java

@@ -0,0 +1,10 @@
+package com.steerinfo.baseinfo.appversionmsg.mapper;
+
+import com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AppVersionMsgMapper extends IBaseMapper<AppVersionMsg, String> {
+}

+ 212 - 0
src/main/java/com/steerinfo/baseinfo/appversionmsg/mapper/AppVersionMsgMapper.xml

@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.baseinfo.appversionmsg.mapper.AppVersionMsgMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg">
+    <id column="VERSION_ID" jdbcType="VARCHAR" property="versionId" />
+    <result column="APP_NAME" jdbcType="VARCHAR" property="appName" />
+    <result column="RESOURCE_URL" jdbcType="VARCHAR" property="resourceUrl" />
+    <result column="VERSION_NUM" jdbcType="VARCHAR" property="versionNum" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+  </resultMap>
+  <sql id="columns">
+    VERSION_ID, APP_NAME, RESOURCE_URL, VERSION_NUM, MEMO
+  </sql>
+  <sql id="columns_alias">
+    t.VERSION_ID, t.APP_NAME, t.RESOURCE_URL, t.VERSION_NUM, t.MEMO
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM APP_VERSION_MSG
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM APP_VERSION_MSG t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="versionId != null and versionId != ''">
+        and VERSION_ID = #{versionId}
+      </if>
+      <if test="appName != null and appName != ''">
+        and APP_NAME = #{appName}
+      </if>
+      <if test="resourceUrl != null and resourceUrl != ''">
+        and RESOURCE_URL = #{resourceUrl}
+      </if>
+      <if test="versionNum != null and versionNum != ''">
+        and VERSION_NUM = #{versionNum}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="versionId != null and versionId != ''">
+        and VERSION_ID LIKE '%${versionId}%'
+      </if>
+      <if test="appName != null and appName != ''">
+        and APP_NAME LIKE '%${appName}%'
+      </if>
+      <if test="resourceUrl != null and resourceUrl != ''">
+        and RESOURCE_URL LIKE '%${resourceUrl}%'
+      </if>
+      <if test="versionNum != null and versionNum != ''">
+        and VERSION_NUM LIKE '%${versionNum}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from APP_VERSION_MSG
+    where VERSION_ID = #{versionId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from APP_VERSION_MSG
+    where 1!=1 
+      <if test="appName != null and appName != ''">
+        or APP_NAME = #{appName}
+      </if>
+      <if test="resourceUrl != null and resourceUrl != ''">
+        or RESOURCE_URL = #{resourceUrl}
+      </if>
+      <if test="versionNum != null and versionNum != ''">
+        or VERSION_NUM = #{versionNum}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg">
+    insert into APP_VERSION_MSG (VERSION_ID, APP_NAME, RESOURCE_URL, 
+      VERSION_NUM, MEMO)
+    values (#{versionId,jdbcType=VARCHAR}, #{appName,jdbcType=VARCHAR}, #{resourceUrl,jdbcType=VARCHAR}, 
+      #{versionNum,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg">
+    insert into APP_VERSION_MSG
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="versionId != null">
+        VERSION_ID,
+      </if>
+      <if test="appName != null">
+        APP_NAME,
+      </if>
+      <if test="resourceUrl != null">
+        RESOURCE_URL,
+      </if>
+      <if test="versionNum != null">
+        VERSION_NUM,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="versionId != null">
+        #{versionId,jdbcType=VARCHAR},
+      </if>
+      <if test="appName != null">
+        #{appName,jdbcType=VARCHAR},
+      </if>
+      <if test="resourceUrl != null">
+        #{resourceUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="versionNum != null">
+        #{versionNum,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg">
+    update APP_VERSION_MSG
+    set APP_NAME = #{appName,jdbcType=VARCHAR},
+      RESOURCE_URL = #{resourceUrl,jdbcType=VARCHAR},
+      VERSION_NUM = #{versionNum,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR}
+    where VERSION_ID = #{versionId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg">
+    update APP_VERSION_MSG
+    <set>
+      <if test="appName != null">
+        APP_NAME = #{appName,jdbcType=VARCHAR},
+      </if>
+      <if test="resourceUrl != null">
+        RESOURCE_URL = #{resourceUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="versionNum != null">
+        VERSION_NUM = #{versionNum,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where VERSION_ID = #{versionId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where VERSION_ID = #{versionId,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 APP_VERSION_MSG 
+      (VERSION_ID, 
+      APP_NAME, RESOURCE_URL, VERSION_NUM, 
+      MEMO)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.versionId,jdbcType=VARCHAR}, 
+      #{item.appName,jdbcType=VARCHAR}, #{item.resourceUrl,jdbcType=VARCHAR}, #{item.versionNum,jdbcType=VARCHAR}, 
+      #{item.memo,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update APP_VERSION_MSG
+     set
+       VERSION_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
+          when #{item.versionId,jdbcType=VARCHAR} then #{item.versionId,jdbcType=VARCHAR}
+       </foreach>
+       ,APP_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
+          when #{item.versionId,jdbcType=VARCHAR} then #{item.appName,jdbcType=VARCHAR}
+       </foreach>
+       ,RESOURCE_URL=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
+          when #{item.versionId,jdbcType=VARCHAR} then #{item.resourceUrl,jdbcType=VARCHAR}
+       </foreach>
+       ,VERSION_NUM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
+          when #{item.versionId,jdbcType=VARCHAR} then #{item.versionNum,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
+          when #{item.versionId,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+     where VERSION_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.versionId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from APP_VERSION_MSG
+    where VERSION_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 106 - 0
src/main/java/com/steerinfo/baseinfo/appversionmsg/model/AppVersionMsg.java

@@ -0,0 +1,106 @@
+package com.steerinfo.baseinfo.appversionmsg.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(value="app版本信息表")
+public class AppVersionMsg implements IBasePO<String> {
+    /**
+     * 主键(VERSION_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private String versionId;
+
+    /**
+     * app名称(APP_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="app名称",required=false)
+    private String appName;
+
+    /**
+     * app资源路径(RESOURCE_URL,VARCHAR,30)
+     */
+    @ApiModelProperty(value="app资源路径",required=false)
+    private String resourceUrl;
+
+    /**
+     * app版本号(VERSION_NUM,VARCHAR,20)
+     */
+    @ApiModelProperty(value="app版本号",required=false)
+    private String versionNum;
+
+    /**
+     * 备注(MEMO,VARCHAR,100)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.versionId;
+    }
+
+    @Override
+    public void setId(String versionId) {
+        this.versionId = versionId == null ? null : versionId.trim();
+    }
+
+    public String getVersionId() {
+        return versionId;
+    }
+
+    public void setVersionId(String versionId) {
+        this.versionId = versionId == null ? null : versionId.trim();
+    }
+
+    public String getAppName() {
+        return appName;
+    }
+
+    public void setAppName(String appName) {
+        this.appName = appName == null ? null : appName.trim();
+    }
+
+    public String getResourceUrl() {
+        return resourceUrl;
+    }
+
+    public void setResourceUrl(String resourceUrl) {
+        this.resourceUrl = resourceUrl == null ? null : resourceUrl.trim();
+    }
+
+    public String getVersionNum() {
+        return versionNum;
+    }
+
+    public void setVersionNum(String versionNum) {
+        this.versionNum = versionNum == null ? null : versionNum.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", versionId=").append(versionId);
+        sb.append(", appName=").append(appName);
+        sb.append(", resourceUrl=").append(resourceUrl);
+        sb.append(", versionNum=").append(versionNum);
+        sb.append(", memo=").append(memo);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 23 - 0
src/main/java/com/steerinfo/baseinfo/appversionmsg/service/IAppVersionMsgService.java

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

+ 36 - 0
src/main/java/com/steerinfo/baseinfo/appversionmsg/service/impl/AppVersionMsgServiceImpl.java

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

+ 1 - 1
src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -328,7 +328,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
     }
 
     @ApiOperation(value = "查询一次计量-C#", notes = "根据车号查询未使用和使用中的预报")
-    @GetMapping(value = "/queryFirst")
+    @GetMapping(value = "/queryByFlag")
     public RESTfulResult queryFirst(@RequestParam String carNo) {
         RESTfulResult rm = failed();
         try {

+ 110 - 0
src/main/java/com/steerinfo/meterwork/meterworknotice/controller/MeterWorkNoticeController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.meterwork.meterworknotice.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.meterwork.meterworknotice.model.MeterWorkNotice;
+import com.steerinfo.meterwork.meterworknotice.service.IMeterWorkNoticeService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * MeterWorkNotice RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-22 09:53
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-22
+ * 作者:generator
+ * 参考:
+ * 描述:MeterWorkNotice RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworknotices")
+public class MeterWorkNoticeController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkNoticeService meterWorkNoticeService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworknotice:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkNotice> list = meterWorkNoticeService.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("meterworknotice:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkNotice> list = meterWorkNoticeService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkNotice对象创建")
+    @ApiImplicitParam(name = "meterWorkNotice", value = "详细实体meterWorkNotice", required = true, dataType = "MeterWorkNotice")
+    //@RequiresPermissions("meterworknotice:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterWorkNotice model){
+        MeterWorkNotice meterWorkNotice = meterWorkNoticeService.add(model);
+        return success(meterWorkNotice);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworknotice:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkNotice meterWorkNotice = meterWorkNoticeService.getById(id);
+        return success(meterWorkNotice);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的meterWorkNotice信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkNotice", value = "详细实体meterWorkNotice", required = true, dataType = "MeterWorkNotice")
+    })
+    //@RequiresPermissions("meterworknotice:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkNotice model){
+        model.setId(id);
+        MeterWorkNotice meterWorkNotice = meterWorkNoticeService.modify(model);
+        return success(meterWorkNotice);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworknotice: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);
+			  meterWorkNoticeService.delete(ids);
+    	}
+      return success();
+    }
+}

+ 10 - 0
src/main/java/com/steerinfo/meterwork/meterworknotice/mapper/MeterWorkNoticeMapper.java

@@ -0,0 +1,10 @@
+package com.steerinfo.meterwork.meterworknotice.mapper;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworknotice.model.MeterWorkNotice;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterWorkNoticeMapper extends IBaseMapper<MeterWorkNotice, String> {
+}

+ 395 - 0
src/main/java/com/steerinfo/meterwork/meterworknotice/mapper/MeterWorkNoticeMapper.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.steerinfo.meterwork.meterworknotice.mapper.MeterWorkNoticeMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworknotice.model.MeterWorkNotice">
+    <id column="NOTICE_ID" jdbcType="VARCHAR" property="noticeId" />
+    <result column="NOTICE_TYPE_NO" jdbcType="VARCHAR" property="noticeTypeNo" />
+    <result column="NOTICE_TYPE_NAME" jdbcType="VARCHAR" property="noticeTypeName" />
+    <result column="NOTICE_LEVEL" jdbcType="VARCHAR" property="noticeLevel" />
+    <result column="NOTICE_NAME" jdbcType="VARCHAR" property="noticeName" />
+    <result column="NOTICE_CONTENT" jdbcType="VARCHAR" property="noticeContent" />
+    <result column="READ_MAN_NUM" jdbcType="VARCHAR" property="readManNum" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <result column="PUBLISH_MAN" jdbcType="VARCHAR" property="publishMan" />
+    <result column="PUBLISH_TIME" jdbcType="VARCHAR" property="publishTime" />
+    <result column="EDIT_MAN" jdbcType="VARCHAR" property="editMan" />
+    <result column="EDIT_TIME" jdbcType="VARCHAR" property="editTime" />
+  </resultMap>
+  <sql id="columns">
+    NOTICE_ID, NOTICE_TYPE_NO, NOTICE_TYPE_NAME, NOTICE_LEVEL, NOTICE_NAME, NOTICE_CONTENT, 
+    READ_MAN_NUM, VALID_FLAG, PUBLISH_MAN, PUBLISH_TIME, EDIT_MAN, EDIT_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.NOTICE_ID, t.NOTICE_TYPE_NO, t.NOTICE_TYPE_NAME, t.NOTICE_LEVEL, t.NOTICE_NAME, 
+    t.NOTICE_CONTENT, t.READ_MAN_NUM, t.VALID_FLAG, t.PUBLISH_MAN, t.PUBLISH_TIME, t.EDIT_MAN, 
+    t.EDIT_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_NOTICE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_NOTICE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="noticeId != null and noticeId != ''">
+        and NOTICE_ID = #{noticeId}
+      </if>
+      <if test="noticeTypeNo != null and noticeTypeNo != ''">
+        and NOTICE_TYPE_NO = #{noticeTypeNo}
+      </if>
+      <if test="noticeTypeName != null and noticeTypeName != ''">
+        and NOTICE_TYPE_NAME = #{noticeTypeName}
+      </if>
+      <if test="noticeLevel != null and noticeLevel != ''">
+        and NOTICE_LEVEL = #{noticeLevel}
+      </if>
+      <if test="noticeName != null and noticeName != ''">
+        and NOTICE_NAME = #{noticeName}
+      </if>
+      <if test="noticeContent != null and noticeContent != ''">
+        and NOTICE_CONTENT = #{noticeContent}
+      </if>
+      <if test="readManNum != null and readManNum != ''">
+        and READ_MAN_NUM = #{readManNum}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </if>
+      <if test="publishMan != null and publishMan != ''">
+        and PUBLISH_MAN = #{publishMan}
+      </if>
+      <if test="publishTime != null and publishTime != ''">
+        and PUBLISH_TIME = #{publishTime}
+      </if>
+      <if test="editMan != null and editMan != ''">
+        and EDIT_MAN = #{editMan}
+      </if>
+      <if test="editTime != null and editTime != ''">
+        and EDIT_TIME = #{editTime}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="noticeId != null and noticeId != ''">
+        and NOTICE_ID LIKE '%${noticeId}%'
+      </if>
+      <if test="noticeTypeNo != null and noticeTypeNo != ''">
+        and NOTICE_TYPE_NO LIKE '%${noticeTypeNo}%'
+      </if>
+      <if test="noticeTypeName != null and noticeTypeName != ''">
+        and NOTICE_TYPE_NAME LIKE '%${noticeTypeName}%'
+      </if>
+      <if test="noticeLevel != null and noticeLevel != ''">
+        and NOTICE_LEVEL LIKE '%${noticeLevel}%'
+      </if>
+      <if test="noticeName != null and noticeName != ''">
+        and NOTICE_NAME LIKE '%${noticeName}%'
+      </if>
+      <if test="noticeContent != null and noticeContent != ''">
+        and NOTICE_CONTENT LIKE '%${noticeContent}%'
+      </if>
+      <if test="readManNum != null and readManNum != ''">
+        and READ_MAN_NUM LIKE '%${readManNum}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </if>
+      <if test="publishMan != null and publishMan != ''">
+        and PUBLISH_MAN LIKE '%${publishMan}%'
+      </if>
+      <if test="publishTime != null and publishTime != ''">
+        and PUBLISH_TIME LIKE '%${publishTime}%'
+      </if>
+      <if test="editMan != null and editMan != ''">
+        and EDIT_MAN LIKE '%${editMan}%'
+      </if>
+      <if test="editTime != null and editTime != ''">
+        and EDIT_TIME LIKE '%${editTime}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_NOTICE
+    where NOTICE_ID = #{noticeId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_NOTICE
+    where 1!=1 
+      <if test="noticeTypeNo != null and noticeTypeNo != ''">
+        or NOTICE_TYPE_NO = #{noticeTypeNo}
+      </if>
+      <if test="noticeTypeName != null and noticeTypeName != ''">
+        or NOTICE_TYPE_NAME = #{noticeTypeName}
+      </if>
+      <if test="noticeLevel != null and noticeLevel != ''">
+        or NOTICE_LEVEL = #{noticeLevel}
+      </if>
+      <if test="noticeName != null and noticeName != ''">
+        or NOTICE_NAME = #{noticeName}
+      </if>
+      <if test="noticeContent != null and noticeContent != ''">
+        or NOTICE_CONTENT = #{noticeContent}
+      </if>
+      <if test="readManNum != null and readManNum != ''">
+        or READ_MAN_NUM = #{readManNum}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </if>
+      <if test="publishMan != null and publishMan != ''">
+        or PUBLISH_MAN = #{publishMan}
+      </if>
+      <if test="publishTime != null and publishTime != ''">
+        or PUBLISH_TIME = #{publishTime}
+      </if>
+      <if test="editMan != null and editMan != ''">
+        or EDIT_MAN = #{editMan}
+      </if>
+      <if test="editTime != null and editTime != ''">
+        or EDIT_TIME = #{editTime}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworknotice.model.MeterWorkNotice">
+    insert into METER_WORK_NOTICE (NOTICE_ID, NOTICE_TYPE_NO, NOTICE_TYPE_NAME, 
+      NOTICE_LEVEL, NOTICE_NAME, NOTICE_CONTENT, 
+      READ_MAN_NUM, VALID_FLAG, PUBLISH_MAN, 
+      PUBLISH_TIME, EDIT_MAN, EDIT_TIME
+      )
+    values (#{noticeId,jdbcType=VARCHAR}, #{noticeTypeNo,jdbcType=VARCHAR}, #{noticeTypeName,jdbcType=VARCHAR}, 
+      #{noticeLevel,jdbcType=VARCHAR}, #{noticeName,jdbcType=VARCHAR}, #{noticeContent,jdbcType=VARCHAR}, 
+      #{readManNum,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, #{publishMan,jdbcType=VARCHAR}, 
+      #{publishTime,jdbcType=VARCHAR}, #{editMan,jdbcType=VARCHAR}, #{editTime,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworknotice.model.MeterWorkNotice">
+    insert into METER_WORK_NOTICE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="noticeId != null">
+        NOTICE_ID,
+      </if>
+      <if test="noticeTypeNo != null">
+        NOTICE_TYPE_NO,
+      </if>
+      <if test="noticeTypeName != null">
+        NOTICE_TYPE_NAME,
+      </if>
+      <if test="noticeLevel != null">
+        NOTICE_LEVEL,
+      </if>
+      <if test="noticeName != null">
+        NOTICE_NAME,
+      </if>
+      <if test="noticeContent != null">
+        NOTICE_CONTENT,
+      </if>
+      <if test="readManNum != null">
+        READ_MAN_NUM,
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG,
+      </if>
+      <if test="publishMan != null">
+        PUBLISH_MAN,
+      </if>
+      <if test="publishTime != null">
+        PUBLISH_TIME,
+      </if>
+      <if test="editMan != null">
+        EDIT_MAN,
+      </if>
+      <if test="editTime != null">
+        EDIT_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="noticeId != null">
+        #{noticeId,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeTypeNo != null">
+        #{noticeTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeTypeName != null">
+        #{noticeTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeLevel != null">
+        #{noticeLevel,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeName != null">
+        #{noticeName,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeContent != null">
+        #{noticeContent,jdbcType=VARCHAR},
+      </if>
+      <if test="readManNum != null">
+        #{readManNum,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="publishMan != null">
+        #{publishMan,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTime != null">
+        #{publishTime,jdbcType=VARCHAR},
+      </if>
+      <if test="editMan != null">
+        #{editMan,jdbcType=VARCHAR},
+      </if>
+      <if test="editTime != null">
+        #{editTime,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworknotice.model.MeterWorkNotice">
+    update METER_WORK_NOTICE
+    set NOTICE_TYPE_NO = #{noticeTypeNo,jdbcType=VARCHAR},
+      NOTICE_TYPE_NAME = #{noticeTypeName,jdbcType=VARCHAR},
+      NOTICE_LEVEL = #{noticeLevel,jdbcType=VARCHAR},
+      NOTICE_NAME = #{noticeName,jdbcType=VARCHAR},
+      NOTICE_CONTENT = #{noticeContent,jdbcType=VARCHAR},
+      READ_MAN_NUM = #{readManNum,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+      PUBLISH_MAN = #{publishMan,jdbcType=VARCHAR},
+      PUBLISH_TIME = #{publishTime,jdbcType=VARCHAR},
+      EDIT_MAN = #{editMan,jdbcType=VARCHAR},
+      EDIT_TIME = #{editTime,jdbcType=VARCHAR}
+    where NOTICE_ID = #{noticeId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworknotice.model.MeterWorkNotice">
+    update METER_WORK_NOTICE
+    <set>
+      <if test="noticeTypeNo != null">
+        NOTICE_TYPE_NO = #{noticeTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeTypeName != null">
+        NOTICE_TYPE_NAME = #{noticeTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeLevel != null">
+        NOTICE_LEVEL = #{noticeLevel,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeName != null">
+        NOTICE_NAME = #{noticeName,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeContent != null">
+        NOTICE_CONTENT = #{noticeContent,jdbcType=VARCHAR},
+      </if>
+      <if test="readManNum != null">
+        READ_MAN_NUM = #{readManNum,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="publishMan != null">
+        PUBLISH_MAN = #{publishMan,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTime != null">
+        PUBLISH_TIME = #{publishTime,jdbcType=VARCHAR},
+      </if>
+      <if test="editMan != null">
+        EDIT_MAN = #{editMan,jdbcType=VARCHAR},
+      </if>
+      <if test="editTime != null">
+        EDIT_TIME = #{editTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where NOTICE_ID = #{noticeId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where NOTICE_ID = #{noticeId,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_WORK_NOTICE 
+      (NOTICE_ID, 
+      NOTICE_TYPE_NO, NOTICE_TYPE_NAME, 
+      NOTICE_LEVEL, NOTICE_NAME, NOTICE_CONTENT, 
+      READ_MAN_NUM, VALID_FLAG, PUBLISH_MAN, 
+      PUBLISH_TIME, EDIT_MAN, EDIT_TIME
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.noticeId,jdbcType=VARCHAR}, 
+      #{item.noticeTypeNo,jdbcType=VARCHAR}, #{item.noticeTypeName,jdbcType=VARCHAR}, 
+      #{item.noticeLevel,jdbcType=VARCHAR}, #{item.noticeName,jdbcType=VARCHAR}, #{item.noticeContent,jdbcType=VARCHAR}, 
+      #{item.readManNum,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR}, #{item.publishMan,jdbcType=VARCHAR}, 
+      #{item.publishTime,jdbcType=VARCHAR}, #{item.editMan,jdbcType=VARCHAR}, #{item.editTime,jdbcType=VARCHAR}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_NOTICE
+     set
+       NOTICE_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+          when #{item.noticeId,jdbcType=VARCHAR} then #{item.noticeId,jdbcType=VARCHAR}
+       </foreach>
+       ,NOTICE_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+          when #{item.noticeId,jdbcType=VARCHAR} then #{item.noticeTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,NOTICE_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+          when #{item.noticeId,jdbcType=VARCHAR} then #{item.noticeTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,NOTICE_LEVEL=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+          when #{item.noticeId,jdbcType=VARCHAR} then #{item.noticeLevel,jdbcType=VARCHAR}
+       </foreach>
+       ,NOTICE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+          when #{item.noticeId,jdbcType=VARCHAR} then #{item.noticeName,jdbcType=VARCHAR}
+       </foreach>
+       ,NOTICE_CONTENT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+          when #{item.noticeId,jdbcType=VARCHAR} then #{item.noticeContent,jdbcType=VARCHAR}
+       </foreach>
+       ,READ_MAN_NUM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+          when #{item.noticeId,jdbcType=VARCHAR} then #{item.readManNum,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+          when #{item.noticeId,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,PUBLISH_MAN=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+          when #{item.noticeId,jdbcType=VARCHAR} then #{item.publishMan,jdbcType=VARCHAR}
+       </foreach>
+       ,PUBLISH_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+          when #{item.noticeId,jdbcType=VARCHAR} then #{item.publishTime,jdbcType=VARCHAR}
+       </foreach>
+       ,EDIT_MAN=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+          when #{item.noticeId,jdbcType=VARCHAR} then #{item.editMan,jdbcType=VARCHAR}
+       </foreach>
+       ,EDIT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+          when #{item.noticeId,jdbcType=VARCHAR} then #{item.editTime,jdbcType=VARCHAR}
+       </foreach>
+     where NOTICE_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.noticeId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_NOTICE
+    where NOTICE_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 211 - 0
src/main/java/com/steerinfo/meterwork/meterworknotice/model/MeterWorkNotice.java

@@ -0,0 +1,211 @@
+package com.steerinfo.meterwork.meterworknotice.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(value="通知公告表")
+public class MeterWorkNotice implements IBasePO<String> {
+    /**
+     * 主键(NOTICE_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private String noticeId;
+
+    /**
+     * 通知类型编码(NOTICE_TYPE_NO,VARCHAR,30)
+     */
+    @ApiModelProperty(value="通知类型编码",required=false)
+    private String noticeTypeNo;
+
+    /**
+     * 通知类型名称(NOTICE_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="通知类型名称",required=false)
+    private String noticeTypeName;
+
+    /**
+     * 通知紧急程度(NOTICE_LEVEL,VARCHAR,30)
+     */
+    @ApiModelProperty(value="通知紧急程度",required=false)
+    private String noticeLevel;
+
+    /**
+     * 通知名称(NOTICE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="通知名称",required=false)
+    private String noticeName;
+
+    /**
+     * 通知内容(NOTICE_CONTENT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="通知内容",required=false)
+    private String noticeContent;
+
+    /**
+     * 阅读人数(READ_MAN_NUM,VARCHAR,5)
+     */
+    @ApiModelProperty(value="阅读人数",required=false)
+    private String readManNum;
+
+    /**
+     * 状态(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态",required=false)
+    private String validFlag;
+
+    /**
+     * 发布人(PUBLISH_MAN,VARCHAR,30)
+     */
+    @ApiModelProperty(value="发布人",required=false)
+    private String publishMan;
+
+    /**
+     * 发布时间(PUBLISH_TIME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="发布时间",required=false)
+    private String publishTime;
+
+    /**
+     * 修改人(EDIT_MAN,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人",required=false)
+    private String editMan;
+
+    /**
+     * 修改时间(EDIT_TIME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private String editTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.noticeId;
+    }
+
+    @Override
+    public void setId(String noticeId) {
+        this.noticeId = noticeId == null ? null : noticeId.trim();
+    }
+
+    public String getNoticeId() {
+        return noticeId;
+    }
+
+    public void setNoticeId(String noticeId) {
+        this.noticeId = noticeId == null ? null : noticeId.trim();
+    }
+
+    public String getNoticeTypeNo() {
+        return noticeTypeNo;
+    }
+
+    public void setNoticeTypeNo(String noticeTypeNo) {
+        this.noticeTypeNo = noticeTypeNo == null ? null : noticeTypeNo.trim();
+    }
+
+    public String getNoticeTypeName() {
+        return noticeTypeName;
+    }
+
+    public void setNoticeTypeName(String noticeTypeName) {
+        this.noticeTypeName = noticeTypeName == null ? null : noticeTypeName.trim();
+    }
+
+    public String getNoticeLevel() {
+        return noticeLevel;
+    }
+
+    public void setNoticeLevel(String noticeLevel) {
+        this.noticeLevel = noticeLevel == null ? null : noticeLevel.trim();
+    }
+
+    public String getNoticeName() {
+        return noticeName;
+    }
+
+    public void setNoticeName(String noticeName) {
+        this.noticeName = noticeName == null ? null : noticeName.trim();
+    }
+
+    public String getNoticeContent() {
+        return noticeContent;
+    }
+
+    public void setNoticeContent(String noticeContent) {
+        this.noticeContent = noticeContent == null ? null : noticeContent.trim();
+    }
+
+    public String getReadManNum() {
+        return readManNum;
+    }
+
+    public void setReadManNum(String readManNum) {
+        this.readManNum = readManNum == null ? null : readManNum.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.trim();
+    }
+
+    public String getPublishMan() {
+        return publishMan;
+    }
+
+    public void setPublishMan(String publishMan) {
+        this.publishMan = publishMan == null ? null : publishMan.trim();
+    }
+
+    public String getPublishTime() {
+        return publishTime;
+    }
+
+    public void setPublishTime(String publishTime) {
+        this.publishTime = publishTime == null ? null : publishTime.trim();
+    }
+
+    public String getEditMan() {
+        return editMan;
+    }
+
+    public void setEditMan(String editMan) {
+        this.editMan = editMan == null ? null : editMan.trim();
+    }
+
+    public String getEditTime() {
+        return editTime;
+    }
+
+    public void setEditTime(String editTime) {
+        this.editTime = editTime == null ? null : editTime.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", noticeId=").append(noticeId);
+        sb.append(", noticeTypeNo=").append(noticeTypeNo);
+        sb.append(", noticeTypeName=").append(noticeTypeName);
+        sb.append(", noticeLevel=").append(noticeLevel);
+        sb.append(", noticeName=").append(noticeName);
+        sb.append(", noticeContent=").append(noticeContent);
+        sb.append(", readManNum=").append(readManNum);
+        sb.append(", validFlag=").append(validFlag);
+        sb.append(", publishMan=").append(publishMan);
+        sb.append(", publishTime=").append(publishTime);
+        sb.append(", editMan=").append(editMan);
+        sb.append(", editTime=").append(editTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 23 - 0
src/main/java/com/steerinfo/meterwork/meterworknotice/service/IMeterWorkNoticeService.java

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

+ 36 - 0
src/main/java/com/steerinfo/meterwork/meterworknotice/service/impl/MeterWorkNoticeServiceImpl.java

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

+ 110 - 0
src/main/java/com/steerinfo/meterwork/meterworktask/controller/MeterWorkTaskController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.meterwork.meterworktask.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.meterwork.meterworktask.model.MeterWorkTask;
+import com.steerinfo.meterwork.meterworktask.service.IMeterWorkTaskService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * MeterWorkTask RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-22 09:54
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-22
+ * 作者:generator
+ * 参考:
+ * 描述:MeterWorkTask RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworktasks")
+public class MeterWorkTaskController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkTaskService meterWorkTaskService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworktask:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkTask> list = meterWorkTaskService.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("meterworktask:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkTask> list = meterWorkTaskService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkTask对象创建")
+    @ApiImplicitParam(name = "meterWorkTask", value = "详细实体meterWorkTask", required = true, dataType = "MeterWorkTask")
+    //@RequiresPermissions("meterworktask:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterWorkTask model){
+        MeterWorkTask meterWorkTask = meterWorkTaskService.add(model);
+        return success(meterWorkTask);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworktask:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkTask meterWorkTask = meterWorkTaskService.getById(id);
+        return success(meterWorkTask);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的meterWorkTask信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkTask", value = "详细实体meterWorkTask", required = true, dataType = "MeterWorkTask")
+    })
+    //@RequiresPermissions("meterworktask:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkTask model){
+        model.setId(id);
+        MeterWorkTask meterWorkTask = meterWorkTaskService.modify(model);
+        return success(meterWorkTask);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworktask: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);
+			  meterWorkTaskService.delete(ids);
+    	}
+      return success();
+    }
+}

+ 10 - 0
src/main/java/com/steerinfo/meterwork/meterworktask/mapper/MeterWorkTaskMapper.java

@@ -0,0 +1,10 @@
+package com.steerinfo.meterwork.meterworktask.mapper;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworktask.model.MeterWorkTask;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterWorkTaskMapper extends IBaseMapper<MeterWorkTask, String> {
+}

+ 316 - 0
src/main/java/com/steerinfo/meterwork/meterworktask/mapper/MeterWorkTaskMapper.xml

@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.meterwork.meterworktask.mapper.MeterWorkTaskMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworktask.model.MeterWorkTask">
+    <id column="TASK_ID" jdbcType="VARCHAR" property="taskId" />
+    <result column="TASK_TYPE_NO" jdbcType="VARCHAR" property="taskTypeNo" />
+    <result column="TASK_TYPE_NAME" jdbcType="VARCHAR" property="taskTypeName" />
+    <result column="TASK_CONTENT" jdbcType="VARCHAR" property="taskContent" />
+    <result column="RECEIVER" jdbcType="VARCHAR" property="receiver" />
+    <result column="PUBLISH_TIME" jdbcType="TIMESTAMP" property="publishTime" />
+    <result column="STATE" jdbcType="VARCHAR" property="state" />
+    <result column="HANDLE_RESULT" jdbcType="VARCHAR" property="handleResult" />
+    <result column="HANDLE_TIME" jdbcType="TIMESTAMP" property="handleTime" />
+  </resultMap>
+  <sql id="columns">
+    TASK_ID, TASK_TYPE_NO, TASK_TYPE_NAME, TASK_CONTENT, RECEIVER, PUBLISH_TIME, STATE, 
+    HANDLE_RESULT, HANDLE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.TASK_ID, t.TASK_TYPE_NO, t.TASK_TYPE_NAME, t.TASK_CONTENT, t.RECEIVER, t.PUBLISH_TIME, 
+    t.STATE, t.HANDLE_RESULT, t.HANDLE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_TASK
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_TASK t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="taskId != null and taskId != ''">
+        and TASK_ID = #{taskId}
+      </if>
+      <if test="taskTypeNo != null and taskTypeNo != ''">
+        and TASK_TYPE_NO = #{taskTypeNo}
+      </if>
+      <if test="taskTypeName != null and taskTypeName != ''">
+        and TASK_TYPE_NAME = #{taskTypeName}
+      </if>
+      <if test="taskContent != null and taskContent != ''">
+        and TASK_CONTENT = #{taskContent}
+      </if>
+      <if test="receiver != null and receiver != ''">
+        and RECEIVER = #{receiver}
+      </if>
+      <if test="publishTime != null">
+        and TO_CHAR(PUBLISH_TIME,'yyyy-MM-dd') = #{publishTime}
+      </if>
+      <if test="state != null and state != ''">
+        and STATE = #{state}
+      </if>
+      <if test="handleResult != null and handleResult != ''">
+        and HANDLE_RESULT = #{handleResult}
+      </if>
+      <if test="handleTime != null">
+        and TO_CHAR(HANDLE_TIME,'yyyy-MM-dd') = #{handleTime}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="taskId != null and taskId != ''">
+        and TASK_ID LIKE '%${taskId}%'
+      </if>
+      <if test="taskTypeNo != null and taskTypeNo != ''">
+        and TASK_TYPE_NO LIKE '%${taskTypeNo}%'
+      </if>
+      <if test="taskTypeName != null and taskTypeName != ''">
+        and TASK_TYPE_NAME LIKE '%${taskTypeName}%'
+      </if>
+      <if test="taskContent != null and taskContent != ''">
+        and TASK_CONTENT LIKE '%${taskContent}%'
+      </if>
+      <if test="receiver != null and receiver != ''">
+        and RECEIVER LIKE '%${receiver}%'
+      </if>
+      <if test="publishTime != null">
+        and TO_CHAR(PUBLISH_TIME,'yyyy-MM-dd') = #{publishTime}
+      </if>
+      <if test="state != null and state != ''">
+        and STATE LIKE '%${state}%'
+      </if>
+      <if test="handleResult != null and handleResult != ''">
+        and HANDLE_RESULT LIKE '%${handleResult}%'
+      </if>
+      <if test="handleTime != null">
+        and TO_CHAR(HANDLE_TIME,'yyyy-MM-dd') = #{handleTime}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_TASK
+    where TASK_ID = #{taskId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_TASK
+    where 1!=1 
+      <if test="taskTypeNo != null and taskTypeNo != ''">
+        or TASK_TYPE_NO = #{taskTypeNo}
+      </if>
+      <if test="taskTypeName != null and taskTypeName != ''">
+        or TASK_TYPE_NAME = #{taskTypeName}
+      </if>
+      <if test="taskContent != null and taskContent != ''">
+        or TASK_CONTENT = #{taskContent}
+      </if>
+      <if test="receiver != null and receiver != ''">
+        or RECEIVER = #{receiver}
+      </if>
+      <if test="publishTime != null">
+        or TO_CHAR(PUBLISH_TIME,'yyyy-MM-dd') = '#{publishTime}'
+      </if>
+      <if test="state != null and state != ''">
+        or STATE = #{state}
+      </if>
+      <if test="handleResult != null and handleResult != ''">
+        or HANDLE_RESULT = #{handleResult}
+      </if>
+      <if test="handleTime != null">
+        or TO_CHAR(HANDLE_TIME,'yyyy-MM-dd') = '#{handleTime}'
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworktask.model.MeterWorkTask">
+    insert into METER_WORK_TASK (TASK_ID, TASK_TYPE_NO, TASK_TYPE_NAME, 
+      TASK_CONTENT, RECEIVER, PUBLISH_TIME, 
+      STATE, HANDLE_RESULT, HANDLE_TIME
+      )
+    values (#{taskId,jdbcType=VARCHAR}, #{taskTypeNo,jdbcType=VARCHAR}, #{taskTypeName,jdbcType=VARCHAR}, 
+      #{taskContent,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR}, #{publishTime,jdbcType=TIMESTAMP}, 
+      #{state,jdbcType=VARCHAR}, #{handleResult,jdbcType=VARCHAR}, #{handleTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworktask.model.MeterWorkTask">
+    insert into METER_WORK_TASK
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="taskId != null">
+        TASK_ID,
+      </if>
+      <if test="taskTypeNo != null">
+        TASK_TYPE_NO,
+      </if>
+      <if test="taskTypeName != null">
+        TASK_TYPE_NAME,
+      </if>
+      <if test="taskContent != null">
+        TASK_CONTENT,
+      </if>
+      <if test="receiver != null">
+        RECEIVER,
+      </if>
+      <if test="publishTime != null">
+        PUBLISH_TIME,
+      </if>
+      <if test="state != null">
+        STATE,
+      </if>
+      <if test="handleResult != null">
+        HANDLE_RESULT,
+      </if>
+      <if test="handleTime != null">
+        HANDLE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="taskId != null">
+        #{taskId,jdbcType=VARCHAR},
+      </if>
+      <if test="taskTypeNo != null">
+        #{taskTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="taskTypeName != null">
+        #{taskTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="taskContent != null">
+        #{taskContent,jdbcType=VARCHAR},
+      </if>
+      <if test="receiver != null">
+        #{receiver,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTime != null">
+        #{publishTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="handleResult != null">
+        #{handleResult,jdbcType=VARCHAR},
+      </if>
+      <if test="handleTime != null">
+        #{handleTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworktask.model.MeterWorkTask">
+    update METER_WORK_TASK
+    set TASK_TYPE_NO = #{taskTypeNo,jdbcType=VARCHAR},
+      TASK_TYPE_NAME = #{taskTypeName,jdbcType=VARCHAR},
+      TASK_CONTENT = #{taskContent,jdbcType=VARCHAR},
+      RECEIVER = #{receiver,jdbcType=VARCHAR},
+      PUBLISH_TIME = #{publishTime,jdbcType=TIMESTAMP},
+      STATE = #{state,jdbcType=VARCHAR},
+      HANDLE_RESULT = #{handleResult,jdbcType=VARCHAR},
+      HANDLE_TIME = #{handleTime,jdbcType=TIMESTAMP}
+    where TASK_ID = #{taskId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworktask.model.MeterWorkTask">
+    update METER_WORK_TASK
+    <set>
+      <if test="taskTypeNo != null">
+        TASK_TYPE_NO = #{taskTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="taskTypeName != null">
+        TASK_TYPE_NAME = #{taskTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="taskContent != null">
+        TASK_CONTENT = #{taskContent,jdbcType=VARCHAR},
+      </if>
+      <if test="receiver != null">
+        RECEIVER = #{receiver,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTime != null">
+        PUBLISH_TIME = #{publishTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null">
+        STATE = #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="handleResult != null">
+        HANDLE_RESULT = #{handleResult,jdbcType=VARCHAR},
+      </if>
+      <if test="handleTime != null">
+        HANDLE_TIME = #{handleTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where TASK_ID = #{taskId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where TASK_ID = #{taskId,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_WORK_TASK 
+      (TASK_ID, 
+      TASK_TYPE_NO, TASK_TYPE_NAME, TASK_CONTENT, 
+      RECEIVER, PUBLISH_TIME, STATE, 
+      HANDLE_RESULT, HANDLE_TIME)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.taskId,jdbcType=VARCHAR}, 
+      #{item.taskTypeNo,jdbcType=VARCHAR}, #{item.taskTypeName,jdbcType=VARCHAR}, #{item.taskContent,jdbcType=VARCHAR}, 
+      #{item.receiver,jdbcType=VARCHAR}, #{item.publishTime,jdbcType=TIMESTAMP}, #{item.state,jdbcType=VARCHAR}, 
+      #{item.handleResult,jdbcType=VARCHAR}, #{item.handleTime,jdbcType=TIMESTAMP} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_TASK
+     set
+       TASK_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TASK_ID" close="end">
+          when #{item.taskId,jdbcType=VARCHAR} then #{item.taskId,jdbcType=VARCHAR}
+       </foreach>
+       ,TASK_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TASK_ID" close="end">
+          when #{item.taskId,jdbcType=VARCHAR} then #{item.taskTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,TASK_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TASK_ID" close="end">
+          when #{item.taskId,jdbcType=VARCHAR} then #{item.taskTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,TASK_CONTENT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TASK_ID" close="end">
+          when #{item.taskId,jdbcType=VARCHAR} then #{item.taskContent,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TASK_ID" close="end">
+          when #{item.taskId,jdbcType=VARCHAR} then #{item.receiver,jdbcType=VARCHAR}
+       </foreach>
+       ,PUBLISH_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TASK_ID" close="end">
+          when #{item.taskId,jdbcType=VARCHAR} then #{item.publishTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,STATE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TASK_ID" close="end">
+          when #{item.taskId,jdbcType=VARCHAR} then #{item.state,jdbcType=VARCHAR}
+       </foreach>
+       ,HANDLE_RESULT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TASK_ID" close="end">
+          when #{item.taskId,jdbcType=VARCHAR} then #{item.handleResult,jdbcType=VARCHAR}
+       </foreach>
+       ,HANDLE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TASK_ID" close="end">
+          when #{item.taskId,jdbcType=VARCHAR} then #{item.handleTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where TASK_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.taskId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_TASK
+    where TASK_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 167 - 0
src/main/java/com/steerinfo/meterwork/meterworktask/model/MeterWorkTask.java

@@ -0,0 +1,167 @@
+package com.steerinfo.meterwork.meterworktask.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 MeterWorkTask implements IBasePO<String> {
+    /**
+     * 主键(TASK_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private String taskId;
+
+    /**
+     * 待办工作类型编码(TASK_TYPE_NO,VARCHAR,30)
+     */
+    @ApiModelProperty(value="待办工作类型编码",required=false)
+    private String taskTypeNo;
+
+    /**
+     * 待办工作类型名称(TASK_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="待办工作类型名称",required=false)
+    private String taskTypeName;
+
+    /**
+     * 代办工作内容(TASK_CONTENT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="代办工作内容",required=false)
+    private String taskContent;
+
+    /**
+     * 接收人(RECEIVER,VARCHAR,30)
+     */
+    @ApiModelProperty(value="接收人",required=false)
+    private String receiver;
+
+    /**
+     * 发布时间(PUBLISH_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="发布时间",required=false)
+    private Date publishTime;
+
+    /**
+     * 工作状态(STATE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="工作状态",required=false)
+    private String state;
+
+    /**
+     * 处理结果(HANDLE_RESULT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="处理结果",required=false)
+    private String handleResult;
+
+    /**
+     * 处理时间(HANDLE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="处理时间",required=false)
+    private Date handleTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.taskId;
+    }
+
+    @Override
+    public void setId(String taskId) {
+        this.taskId = taskId == null ? null : taskId.trim();
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId == null ? null : taskId.trim();
+    }
+
+    public String getTaskTypeNo() {
+        return taskTypeNo;
+    }
+
+    public void setTaskTypeNo(String taskTypeNo) {
+        this.taskTypeNo = taskTypeNo == null ? null : taskTypeNo.trim();
+    }
+
+    public String getTaskTypeName() {
+        return taskTypeName;
+    }
+
+    public void setTaskTypeName(String taskTypeName) {
+        this.taskTypeName = taskTypeName == null ? null : taskTypeName.trim();
+    }
+
+    public String getTaskContent() {
+        return taskContent;
+    }
+
+    public void setTaskContent(String taskContent) {
+        this.taskContent = taskContent == null ? null : taskContent.trim();
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver == null ? null : receiver.trim();
+    }
+
+    public Date getPublishTime() {
+        return publishTime;
+    }
+
+    public void setPublishTime(Date publishTime) {
+        this.publishTime = publishTime;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state == null ? null : state.trim();
+    }
+
+    public String getHandleResult() {
+        return handleResult;
+    }
+
+    public void setHandleResult(String handleResult) {
+        this.handleResult = handleResult == null ? null : handleResult.trim();
+    }
+
+    public Date getHandleTime() {
+        return handleTime;
+    }
+
+    public void setHandleTime(Date handleTime) {
+        this.handleTime = handleTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", taskId=").append(taskId);
+        sb.append(", taskTypeNo=").append(taskTypeNo);
+        sb.append(", taskTypeName=").append(taskTypeName);
+        sb.append(", taskContent=").append(taskContent);
+        sb.append(", receiver=").append(receiver);
+        sb.append(", publishTime=").append(publishTime);
+        sb.append(", state=").append(state);
+        sb.append(", handleResult=").append(handleResult);
+        sb.append(", handleTime=").append(handleTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 23 - 0
src/main/java/com/steerinfo/meterwork/meterworktask/service/IMeterWorkTaskService.java

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

+ 36 - 0
src/main/java/com/steerinfo/meterwork/meterworktask/service/impl/MeterWorkTaskServiceImpl.java

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

+ 1 - 1
src/main/java/com/steerinfo/pretrack/pretrackscale/controller/PreTrackScaleController.java

@@ -162,7 +162,7 @@ public class PreTrackScaleController extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageNum", value = "查询页数", dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", dataType = "Integer")
     })
-    @GetMapping(value = "/select")
+    @GetMapping(value = "/queryByFlag")
     public RESTfulResult selectlist(@RequestParam String carNo, Integer pageNum, Integer pageSize) {
         RESTfulResult rm = failed();
         try {