Merge remote-tracking branch 'origin/jtdev' into jtdev

zhongrj

2023-04-27 6ac7b242bcd32daa6a10298579addc8872a3d8d5

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/controller/AppManageController.java

New file
@@ -0,0 +1,80 @@
package cn.gistack.sm.appmanage.controller;

import cn.gistack.sm.appmanage.entity.AppManage;
import cn.gistack.sm.appmanage.service.IAppManageService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;

/**
 * @ClassName app管理
 * @Description TODO
 * @Author aix
 * @Date 2023/4/26 20:55
 * @Version 1.0
 */
@Slf4j
@Api(tags="app管理")
@RestController
@RequestMapping("/app/manage")
@AllArgsConstructor
public class AppManageController {

    private IAppManageService appManageService;

    /**
     * 分页列表查询
     *
     * @param appManage
     * @return
     */
    @ApiOperation(value = "app管理-分页列表查询", notes = "app管理-分页列表查询")
    @GetMapping(value = "/list")
    public R queryPageList(AppManage appManage, Query query) {
        IPage<AppManage> pageList = appManageService.page(Condition.getPage(query), Condition.getQueryWrapper(appManage));
        return R.data(pageList);
    }

    /**
     * 添加
     *
     * @param appManage
     * @return
     */
    @ApiOperation(value = "app管理-添加", notes = "app管理-添加")
    @PostMapping(value = "/add")
    public R add(@RequestBody AppManage appManage) {
        return R.data(appManageService.save(appManage));
    }

    /**
     * 编辑
     *
     * @param appManage
     * @return
     */
    @ApiOperation(value = "app管理-编辑", notes = "app管理-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public R edit(@RequestBody AppManage appManage) {
        return R.data(appManageService.updateById(appManage));
    }

    /**
     * 通过id删除
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "app管理-通过id删除", notes = "app管理-通过id删除")
    @DeleteMapping(value = "/delete")
    public R<?> delete(@RequestParam(name = "id", required = true) String id) {
        return R.data(appManageService.removeById(id));
    }

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/entity/AppManage.java

New file
@@ -0,0 +1,60 @@
package cn.gistack.sm.appmanage.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springblade.core.mp.base.BaseEntity;

/**
 * @ClassName AppManage
 * @Description TODO
 * @Author aix
 * @Date 2023/4/26 20:31
 * @Version 1.0
 */
@Data
@TableName("sm_app_manage")
@ApiModel(value = "app管理", description = "app管理对象")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class AppManage extends BaseEntity {
    /**
     * 设备类型
     */
    @ApiModelProperty(value = "设备类型")
    private String appType;
    /**
     * 设备版本
     */
    @ApiModelProperty(value = "设备版本")
    private String appVersion;
    /**
     * 版本编码
     */
    @ApiModelProperty(value = "版本编码")
    private String appNo;
    /**
     * 存储路径
     */
    @ApiModelProperty(value = "存储路径")
    private String path;
    /**
     * 是否强制更新
     */
    @ApiModelProperty(value = "是否强制更新")
    private Integer isForce;
    /**
     * 是否提示
     */
    @ApiModelProperty(value = "是否提示")
    private Integer isHint;
    /**
     * 更新内容
     */
    @ApiModelProperty(value = "更新内容")
    private String remarks;

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.java

New file
@@ -0,0 +1,14 @@
package cn.gistack.sm.appmanage.mapper;

import cn.gistack.sm.appmanage.entity.AppManage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @ClassName AppManageMapper
 * @Description TODO
 * @Author aix
 * @Date 2023/4/26 20:52
 * @Version 1.0
 */
public interface AppManageMapper extends BaseMapper<AppManage> {
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.xml

New file
@@ -0,0 +1,6 @@
<?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="cn.gistack.sm.appmanage.mapper.AppManageMapper">


</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/IAppManageService.java

New file
@@ -0,0 +1,14 @@
package cn.gistack.sm.appmanage.service;

import cn.gistack.sm.appmanage.entity.AppManage;
import org.springblade.core.mp.base.BaseService;

/**
 * @ClassName IAppmanageService
 * @Description TODO
 * @Author aix
 * @Date 2023/4/26 20:53
 * @Version 1.0
 */
public interface IAppManageService extends BaseService<AppManage> {
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/impl/AppManageService.java

New file
@@ -0,0 +1,18 @@
package cn.gistack.sm.appmanage.service.impl;

import cn.gistack.sm.appmanage.entity.AppManage;
import cn.gistack.sm.appmanage.mapper.AppManageMapper;
import cn.gistack.sm.appmanage.service.IAppManageService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;

/**
 * @ClassName AppManageService
 * @Description TODO
 * @Author aix
 * @Date 2023/4/26 20:54
 * @Version 1.0
 */
@Service
public class AppManageService extends BaseServiceImpl<AppManageMapper, AppManage> implements IAppManageService {
}