Merge remote-tracking branch 'origin/master'

railway-admin/src/main/java/com/railway/web/controller/business/app/AppTaskController.java

@@ -0,0 +1,72 @@
+package com.railway.web.controller.business.app;
+
+import com.railway.business.app.domain.AppTask;
+import com.railway.business.app.service.IAppTaskService;
+import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.domain.AjaxResult;
+import com.railway.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zhaomn
+ */
+@Api(value = "rest/app", tags = "应用升级 - apk更新任务")
+@RestController
+@Validated
+@RequestMapping(value = "app/task")
+public class AppTaskController extends BaseController {
+
+  private final IAppTaskService appTaskService;
+
+  public AppTaskController(IAppTaskService appTaskService) {
+    this.appTaskService = appTaskService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody AppTask appTask) {
+    return toAjax(appTaskService.create(appTask));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@RequestParam String[] ids) {
+    return toAjax(appTaskService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid AppTask appTask) {
+    return toAjax(appTaskService.update(appTask));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    AppTask info = appTaskService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(AppTask appTask) {
+    startPage();
+    List<AppTask> list = appTaskService.getList(appTask);
+    return getDataTable(list);
+  }
+
+}

railway-admin/src/main/java/com/railway/web/controller/business/app/AppUpgradeController.java

@@ -0,0 +1,91 @@
+package com.railway.web.controller.business.app;
+
+import com.railway.business.app.domain.AppUpgrade;
+import com.railway.business.app.service.IAppUpgradeService;
+import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.domain.AjaxResult;
+import com.railway.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zhaomn
+ */
+@Api(value = "rest/app", tags = "应用升级 - apk版本升级表")
+@RestController
+@Validated
+@RequestMapping(value = "app/upgrade")
+public class AppUpgradeController extends BaseController {
+
+  private final IAppUpgradeService appUpgradeService;
+
+  public AppUpgradeController(
+      IAppUpgradeService appUpgradeService) {
+    this.appUpgradeService = appUpgradeService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody AppUpgrade appUpgrade) {
+    return toAjax(appUpgradeService.create(appUpgrade));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@RequestParam String[] ids) {
+    return toAjax(appUpgradeService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid AppUpgrade appUpgrade) {
+    return toAjax(appUpgradeService.update(appUpgrade));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    AppUpgrade info = appUpgradeService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(AppUpgrade appUpgrade) {
+    startPage();
+    List<AppUpgrade> list = appUpgradeService.getList(appUpgrade);
+    return getDataTable(list);
+  }
+
+  @ApiOperation(value = "APK更新版本检查")
+  @GetMapping("/upgrade")
+  public AjaxResult upgrade(AppUpgrade appUpgrade) {
+    AppUpgrade info = appUpgradeService.getNewestInfo();
+    AjaxResult ajax = AjaxResult.success();
+    if (!info.getApkVersion().equals(appUpgrade.getApkVersion())) {
+      String android = "android";
+      String url;
+      if (android.equals(appUpgrade.getOsType().toLowerCase())) {
+        url = info.getUrl();
+      } else {
+        url = "https://www.baidu.com";
+      }
+      ajax.put("url", url);
+    }
+    return ajax;
+  }
+
+}

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BasePreventBirdController.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/baseinfo/base/prevent/bird", tags = "基础数据-九防台账-防鸟 ")
+@Api(value = "rest/baseinfo/base/prevent/bird", tags = "基础数据 - 九防台账-防鸟 ")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/bird")

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BasePreventFloodController.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/baseinfo/base/prevent/flood", tags = "基础数据-九防台账-防洪")
+@Api(value = "rest/baseinfo/base/prevent/flood", tags = "基础数据 - 九防台账-防洪")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/flood")

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BasePreventForeignController.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/baseinfo/base/prevent/foreign", tags = "基础数据-九防台账-防异物")
+@Api(value = "rest/baseinfo/base/prevent/foreign", tags = "基础数据 - 九防台账-防异物")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/foreign")

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BasePreventIceController.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/baseinfo/base/prevent/ice", tags = "基础数据-九防台账-防冰")
+@Api(value = "rest/baseinfo/base/prevent/ice", tags = "基础数据 - 九防台账-防冰")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/ice")

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BasePreventRustController.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/baseinfo/base/prevent/rust", tags = "基础数据-九防台账-防锈蚀")
+@Api(value = "rest/baseinfo/base/prevent/rust", tags = "基础数据 - 九防台账-防锈蚀")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/rust")

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BasePreventThawController.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/baseinfo/base/prevent/thaw", tags = "基础数据-九防台账-防春融")
+@Api(value = "rest/baseinfo/base/prevent/thaw", tags = "基础数据 - 九防台账-防春融")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/thaw")

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BasePreventThunderController.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/baseinfo/base/prevent/thunder", tags = "基础数据-九防台账-防雷")
+@Api(value = "rest/baseinfo/base/prevent/thunder", tags = "基础数据 - 九防台账-防雷")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/thunder")

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BasePreventTreeController.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/baseinfo/base/prevent/tree", tags = "基础数据-九防台账-防树")
+@Api(value = "rest/baseinfo/base/prevent/tree", tags = "基础数据 - 九防台账-防树")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/tree")

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BasePreventWindController.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/baseinfo/base/prevent/wind", tags = "基础数据-九防台账-防风")
+@Api(value = "rest/baseinfo/base/prevent/wind", tags = "基础数据 - 九防台账-防风")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/wind")

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcebController.java

@@ -192,7 +192,6 @@ public class BusJcebController extends BaseController {
   @ApiOperation(value = "汇总列表")
   @GetMapping(value = "listAll")
   public TableDataInfo listAll(JcebQueryVo query) {
-    startPage();
     List<JcebCountVo> list = new ArrayList<>();
     for (JcebTypeEnum jcebTypeEnum : JcebTypeEnum.values()) {
       JcebCountVo jcebRecordVo = null;

railway-admin/src/main/java/com/railway/web/controller/business/push/BusPushMsgController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.List;
 
-@Api(value = "rest/push/bus/push/msg", tags = "个推消息表")
+@Api(value = "rest/push/bus/push/msg", tags = "消息推送 - 个推消息表")
 @RestController
 @Validated
 @RequestMapping(value = "business/push/bus/push/msg")

railway-admin/src/main/java/com/railway/web/controller/business/safetool/BaseSafetyToolController.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/safetool/base/safety/tool", tags = "安全工具-基础数据")
+@Api(value = "rest/safetool/base/safety/tool", tags = "安全工具 - 基础数据")
 @RestController
 @Validated
 @RequestMapping(value = "business/safetool/base/safety/tool")

railway-admin/src/main/java/com/railway/web/controller/business/safetool/SecScheduledController.java

@@ -19,7 +19,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/safetool/sec/scheduled", tags = "安全工具-计划")
+@Api(value = "rest/safetool/sec/scheduled", tags = "安全工具 - 计划")
 @RestController
 @Validated
 @RequestMapping(value = "business/safetool/sec/scheduled")

railway-admin/src/main/java/com/railway/web/controller/system/SysConfigController.java

@@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author railway
  */
-@Api(tags = "参数配置")
+@Api(tags = "系统管理 - 参数配置")
 @RestController
 @RequestMapping("/system/config")
 public class SysConfigController extends BaseController {

railway-admin/src/main/java/com/railway/web/core/config/SwaggerConfig.java

@@ -124,6 +124,7 @@ public class SwaggerConfig {
         "/monitor/operlog/.*",
         "/captchaImage",
         "/common/.*",
+        "/app/upgrade/.*",
     });
   }
 

railway-business/src/main/java/com/railway/business/app/domain/AppTask.java

@@ -0,0 +1,48 @@
+package com.railway.business.app.domain;
+
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * apk更新任务
+ *
+ * @author zhaomn 2021-12-13
+ */
+@Data
+@ApiModel("apk更新任务")
+@EqualsAndHashCode(callSuper = true)
+public class AppTask extends BaseEntity {
+
+  @ApiModelProperty(value = "主键", hidden = true)
+  private String id;
+
+  @ApiModelProperty(value = "apk记录id")
+  private Long apkId;
+
+  @ApiModelProperty(value = "apk版本")
+  @Length(min = 1, max = 64, message = "【apk版本】长度必须介于 {min} 和 {max} 之间")
+  private String apkVersion;
+
+  @ApiModelProperty(value = "更新类型 0全部，1指定用户， 2指定部门")
+  @Length(min = 1, max = 2, message = "【更新类型 0全部，1指定用户， 2指定部门】长度必须介于 {min} 和 {max} 之间")
+  private String taskType;
+
+  @ApiModelProperty(value = "更新类型指定用户时有值")
+  private Long userId;
+
+  @ApiModelProperty(value = "更新类型指定用户或部门时有值")
+  private Long deptId;
+
+  @ApiModelProperty(value = "任务生效日期")
+  private Date enableDate;
+
+  @ApiModelProperty(value = "del_flag")
+  @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+  private String delFlag;
+
+}

railway-business/src/main/java/com/railway/business/app/domain/AppUpgrade.java

@@ -0,0 +1,41 @@
+package com.railway.business.app.domain;
+
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * apk版本升级表
+ *
+ * @author zhaomn 2021-12-13
+ */
+@Data
+@ApiModel("apk版本升级表")
+@EqualsAndHashCode(callSuper = true)
+public class AppUpgrade extends BaseEntity {
+
+  @ApiModelProperty(value = "主键", hidden = true)
+  private String id;
+
+  @ApiModelProperty(value = "终端类型")
+  private String osType;
+
+  @ApiModelProperty(value = "apk版本")
+  @Length(min = 1, max = 64, message = "【apk版本】长度必须介于 {min} 和 {max} 之间")
+  private String apkVersion;
+
+  @ApiModelProperty(value = "更新说明")
+  private String description;
+
+  @ApiModelProperty(value = "apk下载地址")
+  @Length(min = 1, max = 512, message = "【apk下载地址】长度必须介于 {min} 和 {max} 之间")
+  private String url;
+
+  @ApiModelProperty(value = "del_flag")
+  @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+  private String delFlag;
+
+}

railway-business/src/main/java/com/railway/business/app/mapper/AppTaskMapper.java

@@ -0,0 +1,45 @@
+package com.railway.business.app.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.app.domain.AppTask;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * apk更新任务
+ *
+ * @author zhaomn
+ * @date 2021/12/13
+ */
+@Mapper
+@Repository
+public interface
+AppTaskMapper {
+
+  /**
+   * 新增
+   */
+  int insert(AppTask appTask);
+
+  /**
+   * 删除
+   */
+  int delete(@Param("id") String id);
+
+  /**
+   * 更新
+   */
+  int update(AppTask appTask);
+
+  /**
+   * 获取单个
+   */
+  AppTask getInfo(@Param("id") String id);
+
+  /**
+   * 查询列表
+   */
+  Page<AppTask> getList(AppTask appTask);
+
+}

railway-business/src/main/java/com/railway/business/app/mapper/AppUpgradeMapper.java

@@ -0,0 +1,49 @@
+package com.railway.business.app.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.app.domain.AppUpgrade;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * apk版本升级表
+ *
+ * @author zhaomn
+ * @date 2021/12/13
+ */
+@Mapper
+@Repository
+public interface AppUpgradeMapper {
+
+  /**
+   * 新增
+   */
+  int insert(AppUpgrade appUpgrade);
+
+  /**
+   * 删除
+   */
+  int delete(@Param("id") String id);
+
+  /**
+   * 更新
+   */
+  int update(AppUpgrade appUpgrade);
+
+  /**
+   * 获取单个
+   */
+  AppUpgrade getInfo(@Param("id") String id);
+
+  /**
+   * 查询列表
+   */
+  Page<AppUpgrade> getList(AppUpgrade appUpgrade);
+
+  /**
+   * 获取单个
+   */
+  AppUpgrade getNewestInfo();
+
+}

railway-business/src/main/java/com/railway/business/app/service/IAppTaskService.java

@@ -0,0 +1,39 @@
+package com.railway.business.app.service;
+
+import com.railway.business.app.domain.AppTask;
+import java.util.List;
+
+/**
+ * apk更新任务
+ *
+ * @author zhaomn
+ * @date 2021/12/13
+ */
+public interface IAppTaskService {
+
+  /**
+   * 新增
+   */
+  int create(AppTask appTask);
+
+  /**
+   * 删除
+   */
+  int delete(String[] ids);
+
+  /**
+   * 更新
+   */
+  int update(AppTask appTask);
+
+  /**
+   * 获取单个
+   */
+  AppTask getInfo(String id);
+
+  /**
+   * 查询列表
+   */
+  List<AppTask> getList(AppTask appTask);
+
+}

railway-business/src/main/java/com/railway/business/app/service/IAppUpgradeService.java

@@ -0,0 +1,42 @@
+package com.railway.business.app.service;
+
+import com.railway.business.app.domain.AppUpgrade;
+import java.util.List;
+/**
+* apk版本升级表
+* @author zhaomn
+* @date 2021/12/13
+*/
+public interface IAppUpgradeService{
+
+    /**
+    * 新增
+    */
+    int create(AppUpgrade appUpgrade);
+
+    /**
+    * 删除
+    */
+    int delete(String[] ids);
+
+    /**
+    * 更新
+    */
+    int update(AppUpgrade appUpgrade);
+
+    /**
+    * 获取单个
+    */
+    AppUpgrade getInfo(String id);
+
+    /**
+    * 查询列表
+    */
+    List<AppUpgrade> getList(AppUpgrade appUpgrade);
+
+    /**
+     * 获取单个
+     */
+    AppUpgrade getNewestInfo();
+
+}

railway-business/src/main/java/com/railway/business/app/service/impl/AppTaskServiceImpl.java

@@ -0,0 +1,79 @@
+package com.railway.business.app.service.impl;
+
+import com.railway.business.app.domain.AppTask;
+import com.railway.business.app.mapper.AppTaskMapper;
+import com.railway.business.app.service.IAppTaskService;
+import com.railway.common.utils.SecurityUtils;
+import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * apk更新任务
+ *
+ * @author ZhaoMn 
+ * @date 2021/12/13
+ */
+@Service
+@Transactional(readOnly = true)
+public class AppTaskServiceImpl implements IAppTaskService {
+
+  private final AppTaskMapper appTaskMapper;
+
+  public AppTaskServiceImpl(AppTaskMapper appTaskMapper) {
+    this.appTaskMapper = appTaskMapper;
+  }
+
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(AppTask appTask) {
+    appTask.setCreateTime(new Date());
+    appTask.setCreateBy(SecurityUtils.getUsername());
+    return appTaskMapper.insert(appTask);
+  }
+
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = appTaskMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
+
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(AppTask appTask) {
+    appTask.setUpdateTime(new Date());
+    appTask.setUpdateBy(SecurityUtils.getUsername());
+    return appTaskMapper.update(appTask);
+  }
+
+  /**
+   * 获取单个
+   */
+  @Override
+  public AppTask getInfo(String id) {
+    return appTaskMapper.getInfo(id);
+  }
+
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<AppTask> getList(AppTask appTask) {
+    return appTaskMapper.getList(appTask);
+  }
+}

railway-business/src/main/java/com/railway/business/app/service/impl/AppUpgradeServiceImpl.java

@@ -0,0 +1,88 @@
+package com.railway.business.app.service.impl;
+
+import com.railway.business.app.domain.AppUpgrade;
+import com.railway.business.app.mapper.AppUpgradeMapper;
+import com.railway.business.app.service.IAppUpgradeService;
+import com.railway.common.utils.SecurityUtils;
+import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * apk版本升级表
+ *
+ * @author zhaomn
+ * @date 2021/12/13
+ */
+@Service
+@Transactional(readOnly = true)
+public class AppUpgradeServiceImpl implements IAppUpgradeService {
+
+  private final AppUpgradeMapper appUpgradeMapper;
+
+	public AppUpgradeServiceImpl(AppUpgradeMapper appUpgradeMapper) {
+		this.appUpgradeMapper = appUpgradeMapper;
+	}
+
+	/**
+   * 新增
+   */
+  @Override
+	@Transactional(rollbackFor = Exception.class)
+  public int create(AppUpgrade appUpgrade) {
+    appUpgrade.setCreateTime(new Date());
+    appUpgrade.setCreateBy(SecurityUtils.getUsername());
+    return appUpgradeMapper.insert(appUpgrade);
+  }
+
+  /**
+   * 删除
+   */
+  @Override
+	@Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = appUpgradeMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
+
+  /**
+   * 更新
+   */
+  @Override
+	@Transactional(rollbackFor = Exception.class)
+  public int update(AppUpgrade appUpgrade) {
+    appUpgrade.setUpdateTime(new Date());
+    appUpgrade.setUpdateBy(SecurityUtils.getUsername());
+    return appUpgradeMapper.update(appUpgrade);
+  }
+
+  /**
+   * 获取单个
+   */
+	@Override
+  public AppUpgrade getInfo(String id) {
+    return appUpgradeMapper.getInfo(id);
+  }
+
+  /**
+   * 查询列表
+   */
+	@Override
+  public List<AppUpgrade> getList(AppUpgrade appUpgrade) {
+    return appUpgradeMapper.getList(appUpgrade);
+  }
+
+  /**
+   * 获取单个
+   */
+  @Override
+  public AppUpgrade getNewestInfo() {
+    return appUpgradeMapper.getNewestInfo();
+  }
+
+}

railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusPreventServiceImpl.java

@@ -17,7 +17,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * 基础数据-九防台账
+ * 基础数据 - 九防台账
  *
  * @author wuhonghao
  * @date 2021/10/17

railway-business/src/main/resources/mapper/app/AppTaskMapper.xml

@@ -0,0 +1,188 @@
+<?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.railway.business.app.mapper.AppTaskMapper">
+
+  <resultMap id="BaseResultMap" type="com.railway.business.app.domain.AppTask">
+    <result column="id" property="id"/>
+    <result column="apk_id" property="apkId"/>
+    <result column="apk_version" property="apkVersion"/>
+    <result column="task_type" property="taskType"/>
+    <result column="user_id" property="userId"/>
+    <result column="dept_id" property="deptId"/>
+    <result column="enable_date" property="enableDate"/>
+    <result column="del_flag" property="delFlag"/>
+    <result column="create_by" property="createBy"/>
+    <result column="create_time" property="createTime"/>
+    <result column="update_by" property="updateBy"/>
+    <result column="update_time" property="updateTime"/>
+  </resultMap>
+
+  <sql id="Base_Column_List">
+    id,
+    apk_id,
+    apk_version,
+    task_type,
+    user_id,
+    dept_id,
+    enable_date,
+    del_flag,
+    create_by,
+    create_time,
+    update_by,
+    update_time
+  </sql>
+
+  <insert id="insert" parameterType="com.railway.business.app.domain.AppTask">
+    <selectKey keyProperty="id" order="BEFORE" resultType="String">
+      select replace(uuid(), '-', '') from dual
+    </selectKey>
+    INSERT INTO app_task
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test='null != apkId'>
+        apk_id,
+      </if>
+      <if test='null != apkVersion'>
+        apk_version,
+      </if>
+      <if test='null != taskType'>
+        task_type,
+      </if>
+      <if test='null != userId'>
+        user_id,
+      </if>
+      <if test='null != deptId'>
+        dept_id,
+      </if>
+      <if test='null != enableDate'>
+        enable_date,
+      </if>
+      <if test='null != delFlag'>
+        del_flag,
+      </if>
+      <if test='null != createBy'>
+        create_by,
+      </if>
+      <if test='null != createTime'>
+        create_time,
+      </if>
+      <if test='null != updateBy'>
+        update_by,
+      </if>
+      <if test='null != updateTime'>
+        update_time
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test='null != apkId'>
+        #{apkId},
+      </if>
+      <if test='null != apkVersion'>
+        #{apkVersion},
+      </if>
+      <if test='null != taskType'>
+        #{taskType},
+      </if>
+      <if test='null != userId'>
+        #{userId},
+      </if>
+      <if test='null != deptId'>
+        #{deptId},
+      </if>
+      <if test='null != enableDate'>
+        #{enableDate},
+      </if>
+      <if test='null != delFlag'>
+        #{delFlag},
+      </if>
+      <if test='null != createBy'>
+        #{createBy},
+      </if>
+      <if test='null != createTime'>
+        #{createTime},
+      </if>
+      <if test='null != updateBy'>
+        #{updateBy},
+      </if>
+      <if test='null != updateTime'>
+        #{updateTime}
+      </if>
+    </trim>
+  </insert>
+
+  <delete id="delete">
+    UPDATE app_task
+    set del_flag='1'
+    WHERE id = #{id}
+  </delete>
+
+  <update id="update" parameterType="com.railway.business.app.domain.AppTask">
+    UPDATE app_task
+    <set>
+      <if test='null != apkId'>apk_id = #{apkId},</if>
+      <if test='null != apkVersion'>apk_version = #{apkVersion},</if>
+      <if test='null != taskType'>task_type = #{taskType},</if>
+      <if test='null != userId'>user_id = #{userId},</if>
+      <if test='null != deptId'>dept_id = #{deptId},</if>
+      <if test='null != enableDate'>enable_date = #{enableDate},</if>
+      <if test='null != delFlag'>del_flag = #{delFlag},</if>
+      <if test='null != createBy'>create_by = #{createBy},</if>
+      <if test='null != createTime'>create_time = #{createTime},</if>
+      <if test='null != updateBy'>update_by = #{updateBy},</if>
+      <if test='null != updateTime'>update_time = #{updateTime}</if>
+    </set>
+    WHERE id = #{id}
+  </update>
+
+
+  <select id="getInfo" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM app_task
+    WHERE del_flag='0' and id = #{id}
+
+  </select>
+
+  <select id="getList" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM app_task
+    <where>
+      del_flag='0'
+      <if test="apkId!=null and apkId!=''">
+        and apk_id=#{apkId}
+      </if>
+      <if test="apkVersion!=null and apkVersion!=''">
+        and apk_version=#{apkVersion}
+      </if>
+      <if test="taskType!=null and taskType!=''">
+        and task_type=#{taskType}
+      </if>
+      <if test="userId!=null and userId!=''">
+        and user_id=#{userId}
+      </if>
+      <if test="deptId!=null and deptId!=''">
+        and dept_id=#{deptId}
+      </if>
+      <if test="enableDate!=null and enableDate!=''">
+        and enable_date=#{enableDate}
+      </if>
+      <if test="delFlag!=null and delFlag!=''">
+        and del_flag=#{delFlag}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and create_by=#{createBy}
+      </if>
+      <if test="createTime!=null and createTime!=''">
+        and create_time=#{createTime}
+      </if>
+      <if test="updateBy!=null and updateBy!=''">
+        and update_by=#{updateBy}
+      </if>
+      <if test="updateTime!=null and updateTime!=''">
+        and update_time=#{updateTime}
+      </if>
+    </where>
+  </select>
+
+</mapper>

railway-business/src/main/resources/mapper/app/AppUpgradeMapper.xml

@@ -0,0 +1,160 @@
+<?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.railway.business.app.mapper.AppUpgradeMapper">
+
+  <resultMap id="BaseResultMap" type="com.railway.business.app.domain.AppUpgrade">
+    <result column="id" property="id"/>
+    <result column="apk_version" property="apkVersion"/>
+    <result column="description" property="description"/>
+    <result column="url" property="url"/>
+    <result column="del_flag" property="delFlag"/>
+    <result column="create_by" property="createBy"/>
+    <result column="create_time" property="createTime"/>
+    <result column="update_by" property="updateBy"/>
+    <result column="update_time" property="updateTime"/>
+  </resultMap>
+
+  <sql id="Base_Column_List">
+    id,
+    apk_version,
+    description,
+    url,
+    del_flag,
+    create_by,
+    create_time,
+    update_by,
+    update_time
+  </sql>
+
+  <insert id="insert" parameterType="com.railway.business.app.domain.AppUpgrade">
+    <selectKey keyProperty="id" order="BEFORE" resultType="String">
+      select replace(uuid(), '-', '') from dual
+    </selectKey>
+    INSERT INTO app_upgrade
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test='null != apkVersion'>
+        apk_version,
+      </if>
+      <if test='null != description'>
+        description,
+      </if>
+      <if test='null != url'>
+        url,
+      </if>
+      <if test='null != delFlag'>
+        del_flag,
+      </if>
+      <if test='null != createBy'>
+        create_by,
+      </if>
+      <if test='null != createTime'>
+        create_time,
+      </if>
+      <if test='null != updateBy'>
+        update_by,
+      </if>
+      <if test='null != updateTime'>
+        update_time
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test='null != apkVersion'>
+        #{apkVersion},
+      </if>
+      <if test='null != description'>
+        #{description},
+      </if>
+      <if test='null != url'>
+        #{url},
+      </if>
+      <if test='null != delFlag'>
+        #{delFlag},
+      </if>
+      <if test='null != createBy'>
+        #{createBy},
+      </if>
+      <if test='null != createTime'>
+        #{createTime},
+      </if>
+      <if test='null != updateBy'>
+        #{updateBy},
+      </if>
+      <if test='null != updateTime'>
+        #{updateTime}
+      </if>
+    </trim>
+  </insert>
+
+  <delete id="delete">
+    UPDATE app_upgrade
+    set del_flag='1'
+    WHERE id = #{id}
+  </delete>
+
+  <update id="update" parameterType="com.railway.business.app.domain.AppUpgrade">
+    UPDATE app_upgrade
+    <set>
+      <if test='null != apkVersion'>apk_version = #{apkVersion},</if>
+      <if test='null != description'>description = #{description},</if>
+      <if test='null != url'>url = #{url},</if>
+      <if test='null != delFlag'>del_flag = #{delFlag},</if>
+      <if test='null != createBy'>create_by = #{createBy},</if>
+      <if test='null != createTime'>create_time = #{createTime},</if>
+      <if test='null != updateBy'>update_by = #{updateBy},</if>
+      <if test='null != updateTime'>update_time = #{updateTime}</if>
+    </set>
+    WHERE id = #{id}
+  </update>
+
+
+  <select id="getInfo" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM app_upgrade
+    WHERE del_flag='0' and id = #{id}
+  </select>
+
+  <select id="getList" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM app_upgrade
+    <where>
+      del_flag='0'
+      <if test="apkVersion!=null and apkVersion!=''">
+        and apk_version=#{apkVersion}
+      </if>
+      <if test="description!=null and description!=''">
+        and description=#{description}
+      </if>
+      <if test="url!=null and url!=''">
+        and url=#{url}
+      </if>
+      <if test="delFlag!=null and delFlag!=''">
+        and del_flag=#{delFlag}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and create_by=#{createBy}
+      </if>
+      <if test="createTime!=null and createTime!=''">
+        and create_time=#{createTime}
+      </if>
+      <if test="updateBy!=null and updateBy!=''">
+        and update_by=#{updateBy}
+      </if>
+      <if test="updateTime!=null and updateTime!=''">
+        and update_time=#{updateTime}
+      </if>
+    </where>
+  </select>
+
+  <select id="getNewestInfo" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM app_upgrade
+    WHERE del_flag='0'
+    order by create_time desc
+    limit 0, 1
+  </select>
+
+</mapper>