minio 配置修改（resurce,user模块），security 自定义分页/page 修改

Administrator

2021-03-01 1c2dc757ecb21c15130da427c638744485686c73

minio 配置修改（resurce,user模块），security 自定义分页/page 修改

 blade-ops/blade-resource/src/main/resources/application.yml

@@ -5,7 +5,7 @@
    enabled: true
    name: minio
    tenant-mode: true
    endpoint: http://36.134.81.48:9001
    access-key: minioadmin
    secret-key: minioadmin
    endpoint: http://36.134.81.48:9000
    access-key: adminminio
    secret-key: adminminio
    bucket-name: jfpt

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyUdpServer/entity/BladeAnimalHeat.java

@@ -20,19 +20,28 @@
public class BladeAnimalHeat implements Serializable {

    private static final long serialVersionUID = 4356978043337357357L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;// bigint(20) NOT NULL COMMENT '主键',

    private Integer method;// int(1) NOT NULL COMMENT '方法名: 0 表示 infrared_aiom_picture 图片数据, 1 表示 engine_echo  心跳包    ',

    private String ip;// varchar(63) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '设备IP地址',

    private String picture;// varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图片url路径',

    @TableField("picture_red")
    private String pictureRed;// varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '红外图片url路径',

    @TableField("temp_red")
    private Float tempRed;// float(4,2) DEFAULT NULL COMMENT '当前人员的温度',

    @TableField("person_rect")
    private String personRect;// varchar(63) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '人脸位置二位数组，[left,top,right,bottom]',

    @TableField("person_rect_red")
    private String personRectRed;// varchar(63) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '红外人脸位置二位数组，[left,top,right,bottom]',

    @TableField("create_time")
    private Date createTime;// datetime DEFAULT NULL COMMENT '创建时间',


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/controller/SecurityController.java

@@ -37,6 +37,7 @@
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

/**
 *  控制器
@@ -81,7 +82,7 @@
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入security")
    public R<IPage<SecurityVO>> page(SecurityVO security, Query query) {
    public R<IPage<SecurityVO>> page(Security security, Query query) {
        IPage<SecurityVO> pages = securityService.selectSecurityPage(Condition.getPage(query), security);
        return R.data(pages);
    }

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/mapper/SecurityMapper.java

@@ -39,7 +39,7 @@
     * @param security
     * @return
     */
    List<SecurityVO> selectSecurityPage(IPage page, SecurityVO security);
    List<SecurityVO> selectSecurityPage(IPage page, Security security);

    List<SecurityVO> selectList();
    List<SecurityVO> selectInfo(String snumber);

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/mapper/SecurityMapper.xml

@@ -27,9 +27,24 @@
        <result column="type" property="type"/>
    </resultMap>


    <select id="selectSecurityPage" resultMap="securityResultMap">
        select * from sys_security where is_deleted = 0
    <!--自定义分页-->
    <select id="selectSecurityPage" resultMap="securityResultMaps">
        SELECT s.*,p.jd,p.wd,ST_ASTEXT(e.coordinate) as coordinate
            FROM sys_security s
        LEFT JOIN sys_position p
            on p.snumber=s.snumber
        LEFT JOIN sys_enclosure e
            on e.anumber=s.snumber
        where 1=1
        <if test="security.sname!=null and security.sname !=''">
            <bind name="sname" value="'%'+security.sname+'%'"/>
            and s.sname like #{sname}
        </if>
        <if test="security.snumber!=null">
            <bind name="snumber" value="'%'+security.snumber+'%'"/>
            and s.snumber like #{snumber}
        </if>
        order by s.snumber asc
    </select>

    <select id="selectList" resultMap="securityResultMaps">

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/service/ISecurityService.java

@@ -39,7 +39,7 @@
     * @param security
     * @return
     */
    IPage<SecurityVO> selectSecurityPage(IPage<SecurityVO> page, SecurityVO security);
    IPage<SecurityVO> selectSecurityPage(IPage<SecurityVO> page, Security security);
    List<SecurityVO> selectList();
    List<SecurityVO> selectInfo(String snumber);
    List<Map<String, Object>> selectry();

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/service/impl/SecurityServiceImpl.java

@@ -39,7 +39,7 @@
public class SecurityServiceImpl extends ServiceImpl<SecurityMapper, Security> implements ISecurityService {

    @Override
    public IPage<SecurityVO> selectSecurityPage(IPage<SecurityVO> page, SecurityVO security) {
    public IPage<SecurityVO> selectSecurityPage(IPage<SecurityVO> page, Security security) {
        return page.setRecords(baseMapper.selectSecurityPage(page, security));
    }


 blade-service/blade-user/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@
    enabled: true
    name: minio
    tenant-mode: true
    endpoint: http://36.134.81.48:9001
    access-key: minioadmin
    secret-key: minioadmin
    endpoint: http://36.134.81.48:9000
    access-key: adminminio
    secret-key: adminminio
    bucket-name: jfpt