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

zengh

2021-01-11 db0b070e51db46e779b8d2ad1d4d213b712602cd

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

# Conflicts:
#	src/main/java/org/springblade/modules/catalog/service/catalogService.java
#	src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java

 src/main/java/org/springblade/modules/catalog/controller/catalogController.java

@@ -35,6 +35,8 @@

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
@@ -144,4 +146,46 @@
        return R.data(list);
    }


    /**
     * 总数
     * @param response
     * @return
     */
    @GetMapping("/selectCount")
    public R selectCount(HttpServletResponse response) {
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials","true");
        List<Map<String, Object>> lists = new ArrayList<>();
        List<Map<String, Object>> list1 = catalogService.selectCount();
            Map<String, Object> mapa = new HashMap<String, Object>();
            Map<String, Object> mape = new HashMap<String, Object>();
            Map<String, Object> maps = new HashMap<String, Object>();
            Map<String, Object> mapse = new HashMap<String, Object>();
            mapa.put("value",list1.get(0).get("counta"));
            mapa.put("backgroundColor","#FF0000");
            mapa.put("prefixText","警情总数");
            mapa.put("suffixText","条");
            mape.put("value",list1.get(1).get("counta"));
            mape.put("backgroundColor","#000000");
            mape.put("prefixText","设备总数");
            mape.put("suffixText","个");

            maps.put("value",list1.get(2).get("counta"));
            maps.put("backgroundColor","#6CDEFF");
            maps.put("prefixText","用户总数");
            maps.put("suffixText","个");

            mapse.put("value",list1.get(3).get("counta"));
            mapse.put("backgroundColor","#FF9900");
            mapse.put("prefixText","出警队伍总数");
            mapse.put("suffixText","队");
            lists.add(mapa);
            lists.add(mape);
            lists.add(maps);
            lists.add(mapse);
        return R.data(lists);
    }

}

 src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java

@@ -34,6 +34,7 @@
 */
public interface catalogMapper extends BaseMapper<catalog> {
    List<Map<String, Object>> selectCatalogList();
    List<Map<String, Object>> selectCount();

    List selectCatalogEqNUmber(String pid);
}

 src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml

@@ -24,5 +24,26 @@

    </select>

    <select id="selectCount" resultType="java.util.HashMap">
        SELECT
    COUNT( * ) AS counta
FROM
    sys_alarm UNION
SELECT
    COUNT( * )
FROM
    sys_equipment
WHERE
    parent_id != 0 UNION
SELECT
    COUNT( * )
FROM
    sys_suser UNION
SELECT
    COUNT( * )
FROM
    sys_security WHERE type=1
    </select>


</mapper>

 src/main/java/org/springblade/modules/catalog/service/catalogService.java

@@ -35,4 +35,5 @@
public interface catalogService extends IService<catalog> {
    List<Map<String, Object>> selectCatalogList();
    List<Map<String, Object>> selectCatalogEqNUmber(String pid);
    List<Map<String, Object>> selectCount();
}

 src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java

@@ -50,4 +50,9 @@
    public List selectCatalogEqNUmber(String pid) {
        return baseMapper.selectCatalogEqNUmber(pid);
    }

    @Override
    public List<Map<String, Object>> selectCount() {
        return baseMapper.selectCount();
    }
}

 src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java

@@ -28,7 +28,6 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.catalog.entitly.catalog;
import org.springblade.modules.catalog.service.catalogService;
import org.springblade.modules.deploy.service.IDeployService;
import org.springblade.modules.equipment.vo.EquipmentVOS;
@@ -42,7 +41,6 @@
import springfox.documentation.annotations.ApiIgnore;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

 src/main/java/org/springblade/modules/equipment/entity/Equipment.java

@@ -108,6 +108,8 @@
    private String serialNumber;
    private String stype;
    private String channelNumber;
    private String pay;
    private String expireTime;


}

 src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.equipment.mapper.EquipmentMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="equipmentResultMap" type="org.springblade.modules.equipment.entity.Equipment">
    <resultMap id="equipmentResultMap" type="org.springblade.modules.equipment.vo.EquipmentVO">
        <id column="id" property="id"/>
        <result column="deviceName" property="deviceName"/>
        <result column="deviceNumber" property="deviceNumber"/>
@@ -21,6 +21,8 @@
        <result column="serialNumber" property="serialNumber"/>
        <result column="stype" property="stype"/>
        <result column="channelNumber" property="channelNumber"/>
        <result column="pay" property="pay"/>
        <result column="expireTime" property="expireTime"/>
    </resultMap>

    <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -61,7 +63,7 @@
        FORMAT( jd, 6 ) AS jd,
        FORMAT( wd, 6 ) AS wd,
        street,
        addvcd from sys_equipment where 1=1
        addvcd,pay,expireTime from sys_equipment where 1=1
        <if test="deviceName!=null">
            and (deviceName like concat('%',#{deviceName},'%') or deviceNumber like
            concat('%',#{deviceName},'%'))

 src/main/java/org/springblade/modules/equipment/vo/EquipmentVO.java

@@ -32,5 +32,8 @@
@ApiModel(value = "EquipmentVO对象", description = "EquipmentVO对象")
public class EquipmentVO extends Equipment {
    private static final long serialVersionUID = 1L;
    int type;
    String pay;
    String expireTime;

}