智慧农业后台管理
guoshilong
2022-08-29 c11cb05c6f68d80d84e6c3840d4d8ecf7ccd28c1
遥感同种类型默认只展示一个,遥感新增接口getSensings
6 files modified
63 ■■■■■ changed files
src/main/java/org/springblade/modules/remote/controller/RemoteController.java 15 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/remote/entity/Remote.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/remote/mapper/RemoteMapper.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/remote/mapper/RemoteMapper.xml 25 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/remote/service/IRemoteService.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/remote/service/impl/RemoteServiceImpl.java 12 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/remote/controller/RemoteController.java
@@ -27,6 +27,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.desk.entity.Notice;
import org.springblade.modules.remote.wrapper.RemoteWrapper;
import org.springframework.web.bind.annotation.*;
@@ -38,7 +39,7 @@
import org.springblade.core.boot.ctrl.BladeController;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.*;
/**
 *  控制器
@@ -88,6 +89,11 @@
        return R.data(pages);
    }
    @GetMapping("/getSensings")
    public R getSensing(String type){
        return R.data(remoteService.getRemoteList(type));
    }
    /**
     * 新增
     */
@@ -115,6 +121,13 @@
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入remote")
    public R submit(@Valid @RequestBody Remote remote) {
        if (remote.getReType().equals("0")) {//判断是否修改为展示
            //查找当前类型默认展示的数量
            List<Remote> remoteList = remoteService.findByType(remote);
            if (remoteList.size() > 0) {
                throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("该类型已有默认展示,请先取消默认展示"));
            }
        }
        return R.status(remoteService.saveOrUpdate(remote));
    }
src/main/java/org/springblade/modules/remote/entity/Remote.java
@@ -73,7 +73,7 @@
     */
    private String reTp;
    /**
     * 0麻姑米集团、1水龙米业、2有机基地、3绿色基地
     * 0麻姑米集团、1水龙米业、2有机基地、3绿色基地、4育秧中心
     */
    private Integer type;
src/main/java/org/springblade/modules/remote/mapper/RemoteMapper.java
@@ -16,6 +16,7 @@
 */
package org.springblade.modules.remote.mapper;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.remote.entity.Remote;
import org.springblade.modules.remote.vo.RemoteVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -39,4 +40,7 @@
     */
    List<RemoteVO> selectRemotePage(IPage page, RemoteVO remote);
    List<Remote> findByType(@Param("remote") Remote remote);
    List<Remote> getRemoteList(@Param("type") String type);
}
src/main/java/org/springblade/modules/remote/mapper/RemoteMapper.xml
@@ -26,6 +26,31 @@
        select *
        from sys_remote
        where is_deleted = 0
        ORDER BY id DESC
    </select>
    <select id="findByType" resultType="org.springblade.modules.remote.entity.Remote">
        SELECT *
        FROM sys_remote r
        WHERE 1=1 AND r.re_type = 0
        <if test="remote.type!=null and remote.type != '' or remote.type != 0 " >
            AND r.type = #{remote.type}
        </if>
            AND r.is_deleted = 0
    </select>
    <select id="getRemoteList" resultType="org.springblade.modules.remote.entity.Remote">
        select
            id,create_user,create_dept,create_time,update_user,update_time,status,is_deleted,
            re_name,re_url,re_time,re_type,release_time,re_context,re_tp,type
        from sys_remote
        WHERE 1=1 AND is_deleted = 0
        <if test="type == 'ALL' ">
        </if>
        <if test=" type =='SHOW' ">
            AND re_type = 0
        </if>
    </select>
</mapper>
src/main/java/org/springblade/modules/remote/service/IRemoteService.java
@@ -21,6 +21,8 @@
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.*;
/**
 *  服务类
 *
@@ -38,4 +40,7 @@
     */
    IPage<RemoteVO> selectRemotePage(IPage<RemoteVO> page, RemoteVO remote);
    List<Remote> findByType(Remote remote);
    List<Remote> getRemoteList(String type);
}
src/main/java/org/springblade/modules/remote/service/impl/RemoteServiceImpl.java
@@ -24,6 +24,8 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
/**
 *  服务实现类
 *
@@ -38,4 +40,14 @@
        return page.setRecords(baseMapper.selectRemotePage(page, remote));
    }
    @Override
    public List<Remote> findByType(Remote remote) {
        return baseMapper.findByType(remote);
    }
    @Override
    public List<Remote> getRemoteList(String type) {
        return baseMapper.getRemoteList(type);
    }
}