admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/shenzhendev' into pengjdev

Browse Source
This commit is contained in:
pengjie 2023-02-27 17:25:49 +08:00
commit 9939d82254
47 changed files with 828 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArcFace64.dat
View File

@ -1 +1 @@
EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGEDVIQGKEJIKACHIIXDEELIWCCEEELCVCEHFHAJGIPGIIKJRASJFEHAMIKCIGXAPGEHIIZGFBBJMFJJNGFHUGDGDFGFAITGDAXBGAZGKAMBMDABKBAERDUHDAUDOEBIBGBBMCUIZGABKCABIDMFHFRILIIANEBEWBOAIJHBYFAIREBFQFFCHHREKFTFJJQIAGFDSDZHMHUCGBVHIAUENBCJIBBJDIHHDIQFKFNDEBJCKCFGLJKBMHFAZHTHOIRGLJFDUHWEVFGFHDKIBEKFVCGAQJGCYBZAMHDJBJREAIOJPIAJDCJFXHKHPJTHUBTJPDWISESIEIPISDWDRAMFVFFBJCTFVFAARGJHFIMELIQJEAHFRFQDTERDCCGDCIKCAGBJVDLGHEXEBAWAMAFITJDANGBCRDPBPEECBAVAEAYJVHCBNCPHOFUJNGGJFFREZFAAKGEGQCQHDBZBWENDKCGHTFXCXAIEHGWEPFOGYFIFSHOCRJCBOHDDLDCCAJGBGAPCXDMHMAYAHBFHNCYJTEHENIJEBDNBPFLBDBUGADIGTEWEAHEEGHGJBDXEEJMBLAKHYJHBPEKBEHHHQDECQEMGEFRCIHLIVGXBXFQBTJECKEPCSDRGPFLAZADHCENEJCQJIHPDNJTCBDXCCAFEFGIJNEBBIHSFFFMEEDADRCHFKEXHNEIAFHAAGHAJQCTGDGVFOIYBRJEJVEUJJDOEIJCIQBMCUASHBIVHNDADKALISDXFADZICEJCPASDRGSERDWHXIGAYBJFVELGJGXEHDQJTHYBXHVHNIAIWIOIJGRCBAXAIIHFJGGAHGDAPAHCHHHJHETHBBDIUJOJBCVIMJLEKDJIUBDHHBRAEGMEBBUHKHKCABLHQARARFTFRCZGTEGANJTBGJTFTCJGXHDHXEHEGBMGDABADDCAFABHKFRAWDQJAEFCNGMCTBWADCGCUACALIAHFDEAEJUESGFCTFAHZFOFKHSILFFIHJLAWHEFMFJFKBODTCDJGEPBXHQHYBSHWBADOJCIAHLJJCUBYFLHPDMJTJGJVFZEEDKIMGJHUBTJDATAKFICECEBMHBIKJQCTFDEZFBAHJNFLJGIKAJCGDOIHJSEE
EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGEDVIQGKEJIKACHIIXDEELIWCCEEELCVCEHFHAJGIPGIIKJRASJFEHAMIKCIGXAPGEHIIZGFBBJMFJJNGFHUGDGDFGFAITGDAXBGAZGKAMBMDABKBAERDUHDAUDOEBIBGBBMCUIZGABKCABIDMFHFRILIIANEBEWBOAIJHBYFAIREBFQFFCHHREKFTFJJQIAGFDSDZHMHUCGBVHIAUENBCJIBBJDIHHDIQFKFNDEBJCKCFGLJKBMHFAZHTHOIRGLJFDUHWEVFGFHDKIBEKFVCGAQJGCYBZAMHDJBJREAIOJPIAJDCJFXHKHPJTHUBTJPDWISESIEIPISDWDRAMFVFFBJCTFVFAARGJHFIMELIQJEAHFRFQDTERDCCGDCIKCAGBJVDLGHEXEBAWAMAFITJDANGBCRDPBPEECBAVAEBRGBDMFGGNDQAYCJFJAHJGGFBEBGEOHZDPILAHJEDIDIFWIOJGJFCTGOHQDEBOEGERJVFXIDJJESFKAPASCMCSAXISBQBSEHDDGZHBAREVALCSCAELEGBJIXIRDKAVADBVCNDPHFIYJJGTDEAPITIHBVFEGNBFJODDFEFZGMIKAYDEDIGWDFECBCJVIAAWDIBVGOFOASFOIRARITJOGOERHZAAEAGUIKCVHRCBHJDRJLBACOFZFTENEWDYCNCWDZHUHTFJDIDFEWDGATCAFUERJDCHFZHDAKJHJGDGINIHEPDAABJEIXHOIDAMDTEHCEGKALDAFTEPGZGHHHEVHSHXIZIWISEYFWGMAEIGEZJCDHJIJPBECUIKEYGJHYGLFAJFDPIBARAFGNEEJGDZAYEIAHGYJJELBHBAIXHWGZECJOHFAJCEBBBAINITDTECIFFTHNBJJUCZGYBVEAEBILFOGXEHBKEYELDKFKFVAWESBAHMCOANDEJLIYFMFFDFCAJNJQJGJSHWAEFHIQCJCLGQIYGYEEJBAKIMGACJFNJUDEGQEUCXHPCWBXHAHDASDHJJFLAHIDJLJFCDBMGVIFBBCRIDCSITGLIEAKAUDCFIGHBZARBFESBEDVJVBQIKGQATGBECBSJJDFDKAMDOAPEUCTAXJLGQBXFCIHEGFNDJESCHEHHPBWBQIO

2
pom.xml
View File

@ -725,7 +725,7 @@
<dependency>
<groupId>net.sf.mpxj</groupId>
<artifactId>mpxj</artifactId>
<version>8.3.3</version>
<version>10.11.0</version>
</dependency>
</dependencies>

12
src/main/java/com/zhgd/xmgl/device/water/controller/CallBackController.java
View File

@ -12,6 +12,7 @@ import com.zhgd.xmgl.modules.water.entity.WaterSupplierRecord;
import com.zhgd.xmgl.modules.water.mapper.WaterSupplierRecordMapper;
import com.zhgd.xmgl.modules.water.service.IWaterMeterRecordDetailService;
import com.zhgd.xmgl.modules.water.service.IWaterMeterService;
import com.zhgd.xmgl.util.Base64;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.slf4j.Logger;
@ -119,7 +120,7 @@ public class CallBackController {
QueryWrapper<WaterMeter> ammeterQueryWrapper = new QueryWrapper<>();
ammeterQueryWrapper.lambda().eq(WaterMeter::getDeviceId, jsonObject.getString("deviceId"));
WaterMeter one = ammeterService.getOne(ammeterQueryWrapper);
if (decodeJson.containsKey("hex")) {
for (Map.Entry<String, Object> entry : decodeJson.entrySet()) {
WaterSupplierRecord waterSupplierRecord = waterSupplierRecordMapper.selectProjectWaterSupplier(one.getProjectSn());
WaterMeter waterMeter = new WaterMeter();
waterMeter.setId(one.getId());
@ -127,7 +128,7 @@ public class CallBackController {
ammeterService.updateById(waterMeter);
String strdata = decodeJson.getString("hex");
String strdata = Base64.decodeBase64ByHex(String.valueOf(entry.getValue()));
String tonnage = strdata.substring(28, 36) + "." + strdata.substring(36, 38);
WaterMeterRecordDetail ammeterRecordDetail = new WaterMeterRecordDetail();
ammeterRecordDetail.setAddTime(new Date());
@ -136,9 +137,10 @@ public class CallBackController {
ammeterRecordDetail.setProjectSn(one.getProjectSn());
waterMeterRecordDetailService.save(ammeterRecordDetail);
String tp = MeterUtils.answerDevice(jsonObject.get("deviceId").toString(), "admin", waterSupplierRecord.getSupplierProductId(),
waterSupplierRecord.getMasterKey(), waterSupplierRecord.getAppKey(), waterSupplierRecord.getAppSecret(), null, null);
log.info(tp);
//不需要阀控，不需要回调
//String tp = MeterUtils.answerDevice(jsonObject.get("deviceId").toString(), "admin", waterSupplierRecord.getSupplierProductId(),
// waterSupplierRecord.getMasterKey(), waterSupplierRecord.getAppKey(), waterSupplierRecord.getAppSecret(), null, null);
//log.info(tp);
}
}

2
src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml
View File

@ -11,7 +11,7 @@
</if>
<if test="param.startTime!=null and param.startTime!=''">
AND a.start_time &gt;=CONCAT(DATE_FORMAT(#{param.startTime},'%Y-%m-%d'),' 00:00:00')
</if>z
</if>
<if test="param.endTime!=null and param.endTime!=''">
AND a.end_time &lt;=CONCAT(DATE_FORMAT(#{param.endTime},'%Y-%m-%d'),' 23:59:59')
</if>

2
src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml
View File

@ -376,7 +376,7 @@
IFNULL(SUM((IF(status = 1 or status = 4, 1, 0))), 0) allRectificationNum,
IFNULL(SUM((IF(!(status = 1 or status = 4) or status is null, 1, 0))),
0) allNoRectificationNum,
IFNULL(SUM((IF(YEARWEEK(change_limit_time, 1) = YEARWEEK(now(), 7), 1, 0))),
IFNULL(SUM((IF(YEARWEEK(inspect_time, 1) = YEARWEEK(now(), 7), 1, 0))),
0) weekTotalNum
from hidden_danger_inspection_record
WHERE project_sn = #{projectSn}

2
src/main/java/com/zhgd/xmgl/modules/electrical/mapper/xml/ElectricalDataMapper.xml
View File

@ -34,6 +34,6 @@
<if test="param.endTime!=null and param.endTime!=''">
and a.upload_time &lt;=CONCAT(DATE_FORMAT(#{param.endTime},'%Y-%m-%d'),' 23:59:59')
</if>
ORDER BY a.upload_time DESC
</select>
</mapper>

237
src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java Normal file
View File

@ -0,0 +1,237 @@
package com.zhgd.xmgl.modules.material.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.oConvertUtils;
import com.zhgd.xmgl.modules.material.entity.MaterialApproachRecord;
import com.zhgd.xmgl.modules.material.service.IMaterialApproachRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* @Title: Controller
* @Description: 材料进场记录
* @author： zp
* @date： 2023-02-23
* @version： V1.0
*/
@RestController
@RequestMapping("/xmgl/materialApproachRecord")
@Slf4j
@Api(tags = "MaterialApproachRecordController相关Api")
public class MaterialApproachRecordController {
@Autowired
private IMaterialApproachRecordService materialApproachRecordService;
/**
* 分页列表查询
*
* @param materialApproachRecord
* @param pageNo 页码
* @param pageSize 条数
* @param req
* @return
*/
@ApiOperation(value = " 分页列表查询材料进场记录 信息", notes = "分页列表查询材料进场记录 信息", httpMethod = "GET")
@GetMapping(value = "/page")
public Result<IPage<MaterialApproachRecord>> queryPageList(MaterialApproachRecord materialApproachRecord,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MaterialApproachRecord> queryWrapper = QueryGenerator.initQueryWrapper(materialApproachRecord, req.getParameterMap());
Page<MaterialApproachRecord> page = new Page<MaterialApproachRecord>(pageNo, pageSize);
IPage<MaterialApproachRecord> pageList = materialApproachRecordService.page(page, queryWrapper);
return Result.success(pageList);
}
/**
* 列表查询
*
* @param materialApproachRecord
* @param pageNo 页码
* @param pageSize 条数
* @param req
* @return
*/
@ApiOperation(value = " 列表查询材料进场记录 信息", notes = "列表查询材料进场记录 信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<MaterialApproachRecord>> queryList(MaterialApproachRecord materialApproachRecord,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MaterialApproachRecord> queryWrapper = QueryGenerator.initQueryWrapper(materialApproachRecord, req.getParameterMap());
return Result.success(materialApproachRecordService.list(queryWrapper));
}
/**
* 添加
*
* @param materialApproachRecord
* @return
*/
@ApiOperation(value = " 添加材料进场记录 信息", notes = "添加材料进场记录 信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<MaterialApproachRecord> add(@RequestBody MaterialApproachRecord materialApproachRecord) {
materialApproachRecordService.save(materialApproachRecord);
return Result.ok();
}
/**
* 编辑
*
* @param materialApproachRecord
* @return
*/
@ApiOperation(value = "编辑材料进场记录 信息", notes = "编辑材料进场记录 信息", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<MaterialApproachRecord> edit(@RequestBody MaterialApproachRecord materialApproachRecord) {
materialApproachRecordService.updateById(materialApproachRecord);
return Result.ok();
}
/**
* 通过id删除
*
* @param id
* @return
*/
@ApiOperation(value = "删除材料进场记录 信息", notes = "删除材料进场记录 信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "材料进场记录 ID", paramType = "query", required = true, dataType = "Integer")
@PostMapping(value = "/delete")
public Result<MaterialApproachRecord> delete(@RequestBody String id) {
materialApproachRecordService.removeById(JSON.parseObject(id).get("id").toString());
return Result.ok();
}
/**
* 批量删除
*
* @param ids
* @return
*/
@ApiOperation(value = "批量删除材料进场记录 信息", notes = "批量删除材料进场记录 信息", httpMethod = "DELETE")
@ApiImplicitParam(name = "id", value = "材料进场记录 ID字符串", paramType = "query", required = true, dataType = "String")
@DeleteMapping(value = "/deleteBatch")
public Result<MaterialApproachRecord> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
if (ids == null || "".equals(ids.trim())) {
throw new IllegalArgumentException("参数不识别！");
} else {
this.materialApproachRecordService.removeByIds(Arrays.asList(ids.split(",")));
}
return Result.ok();
}
/**
* 通过id查询
*
* @param id
* @return
*/
@ApiOperation(value = "通过id查询材料进场记录 信息", notes = "通过id查询材料进场记录 信息", httpMethod = "GET")
@ApiImplicitParam(name = "id", value = "材料进场记录 ID", paramType = "query", required = true, dataType = "Integer")
@GetMapping(value = "/queryById")
public Result<MaterialApproachRecord> queryById(@RequestParam(name = "id", required = true) String id) {
MaterialApproachRecord materialApproachRecord = materialApproachRecordService.getById(id);
return Result.success(materialApproachRecord);
}
/**
* 导出excel
*
* @param request
* @param response
*/
@ApiOperation(value = "导出excel材料进场记录 信息", notes = "导出excel材料进场记录 信息", httpMethod = "POST")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
// Step.1 组装查询条件
QueryWrapper<MaterialApproachRecord> queryWrapper = null;
try {
String paramsStr = request.getParameter("paramsStr");
if (oConvertUtils.isNotEmpty(paramsStr)) {
String deString = URLDecoder.decode(paramsStr, "UTF-8");
MaterialApproachRecord materialApproachRecord = JSON.parseObject(deString, MaterialApproachRecord.class);
queryWrapper = QueryGenerator.initQueryWrapper(materialApproachRecord, request.getParameterMap());
}
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<MaterialApproachRecord> pageList = materialApproachRecordService.list(queryWrapper);
//导出文件名称
mv.addObject(NormalExcelConstants.FILE_NAME, "材料进场记录 列表");
mv.addObject(NormalExcelConstants.CLASS, MaterialApproachRecord.class);
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("材料进场记录 列表数据", "导出人:Jeecg", "导出信息"));
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@ApiOperation(value = "通过excel导入材料进场记录 信息", notes = "通过excel导入材料进场记录 信息", httpMethod = "POST")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
ImportParams params = new ImportParams();
params.setTitleRows(2);
params.setHeadRows(1);
params.setNeedSave(true);
try {
List<MaterialApproachRecord> listMaterialApproachRecords = ExcelImportUtil.importExcel(file.getInputStream(), MaterialApproachRecord.class, params);
for (MaterialApproachRecord materialApproachRecordExcel : listMaterialApproachRecords) {
materialApproachRecordService.save(materialApproachRecordExcel);
}
return Result.ok("文件导入成功！数据行数：" + listMaterialApproachRecords.size());
} catch (Exception e) {
log.error(e.getMessage());
return Result.error("文件导入失败！");
} finally {
try {
file.getInputStream().close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return Result.ok("文件导入失败！");
}
}

5
src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialDetectionReportController.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.material.entity.MaterialDetectionReport;
import com.zhgd.xmgl.modules.material.entity.qo.DetectionDateQO;
import com.zhgd.xmgl.modules.material.entity.qo.MaterialDetectionReportQO;
import com.zhgd.xmgl.modules.material.entity.qo.SumQualifiedRatioVO;
import com.zhgd.xmgl.modules.material.service.MaterialDetectionReportService;
@ -65,8 +66,8 @@ public class MaterialDetectionReportController {
@ApiImplicitParam(name = "projectSn", value = "项目sn", dataType = "string", dataTypeClass = String.class, paramType = "query"),
@ApiImplicitParam(name = "size", value = "返回条数，默认10条", dataType = "string", dataTypeClass = String.class, defaultValue = "10", paramType = "query")
})
public Result<List<MaterialDetectionReport>> limitByDetectionDate(String projectSn, @RequestParam(name = "size", defaultValue = "10") Integer size) {
return Result.success(materialDetectionReportService.limitByDetectionDate(projectSn, size));
public Result<List<MaterialDetectionReport>> limitByDetectionDate(DetectionDateQO qo) {
return Result.success(materialDetectionReportService.limitByDetectionDate(qo));
}
/**

69
src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialApproachRecord.java Normal file
View File

@ -0,0 +1,69 @@
package com.zhgd.xmgl.modules.material.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 材料进场记录
* @author： zp
* @date： 2023-02-23
* @version： V1.0
*/
@Data
@TableName("material_approach_record")
@ApiModel(value = "MaterialApproachRecord实体类", description = "MaterialApproachRecord")
public class MaterialApproachRecord implements Serializable {
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "id")
private Integer id;
/**
* 进场时间
*/
@Excel(name = "进场时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "进场时间")
private Date entryTime;
/**
* 材料类型
*/
@Excel(name = "材料类型", width = 15)
@ApiModelProperty(value = "材料类型")
private String materialType;
/**
* 生产厂家
*/
@Excel(name = "生产厂家", width = 15)
@ApiModelProperty(value = "生产厂家")
private String manufacturer;
/**
* 车牌号
*/
@Excel(name = "车牌号", width = 15)
@ApiModelProperty(value = "车牌号")
private String licensePlateNumber;
/**
* 进场量
*/
@Excel(name = "进场量", width = 15)
@ApiModelProperty(value = "进场量")
private Double approachVolume;
@ApiModelProperty(value = "projectSn")
private String projectSn;
}

7
src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialDetectionReport.java
View File

@ -82,5 +82,12 @@ public class MaterialDetectionReport implements Serializable {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateDate;
@ApiModelProperty(value = "楼层")
private String floor;
@ApiModelProperty(value = "材料种类")
private String materialType;
}

24
src/main/java/com/zhgd/xmgl/modules/material/entity/qo/DetectionDateQO.java Normal file
View File

@ -0,0 +1,24 @@
package com.zhgd.xmgl.modules.material.entity.qo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel
public class DetectionDateQO {
/**
* 事件类型
*/
@TableField(value = "event_type")
@ApiModelProperty(value = "事件类型")
private String eventType;
@ApiModelProperty(value = "楼层")
private String floor;
private String projectSn;
private Integer size;
}

5
src/main/java/com/zhgd/xmgl/modules/material/entity/qo/MaterialDetectionReportQO.java
View File

@ -91,5 +91,10 @@ public class MaterialDetectionReportQO implements Serializable {
*/
@ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss 结束时间")
private String endUpdateDate;
@ApiModelProperty(value = "楼层")
private String floor;
@ApiModelProperty(value = "材料种类")
private String materialType;
}

5
src/main/java/com/zhgd/xmgl/modules/material/entity/vo/MeasuredRealQuantityVO.java
View File

@ -59,4 +59,9 @@ public class MeasuredRealQuantityVO implements Serializable {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date surveyingDate;
/**
* 实测实量楼层
*/
@ApiModelProperty(value = "实测实量楼层")
private String floorName;
}

19
src/main/java/com/zhgd/xmgl/modules/material/mapper/MaterialApproachRecordMapper.java Normal file
View File

@ -0,0 +1,19 @@
package com.zhgd.xmgl.modules.material.mapper;
import java.util.List;
import com.zhgd.xmgl.modules.material.entity.MaterialApproachRecord;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 材料进场记录
* @author： zp
* @date： 2023-02-23
* @version： V1.0
*/
@Mapper
public interface MaterialApproachRecordMapper extends BaseMapper<MaterialApproachRecord> {
}

4
src/main/java/com/zhgd/xmgl/modules/material/mapper/xml/MaterialApproachRecordMapper.xml Normal file
View File

@ -0,0 +1,4 @@
<?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.zhgd.xmgl.modules.material.mapper.MaterialApproachRecordMapper">
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/material/mapper/xml/MaterialDetailsMapper.xml
View File

@ -59,6 +59,8 @@
left join zjsj_material_details zmd on zmt.id = zmd.type_id
where zmt.project_sn = #{projectSn}
group by zmt.id
ORDER BY
consume_value DESC
</select>
<select id="passConsumeRatio" resultType="com.zhgd.xmgl.modules.material.entity.dto.MaterialDetailsMonthDTO">

14
src/main/java/com/zhgd/xmgl/modules/material/service/IMaterialApproachRecordService.java Normal file
View File

@ -0,0 +1,14 @@
package com.zhgd.xmgl.modules.material.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.material.entity.MaterialApproachRecord;
/**
* @Description: 材料进场记录
* @author： zp
* @date： 2023-02-23
* @version： V1.0
*/
public interface IMaterialApproachRecordService extends IService<MaterialApproachRecord> {
}

3
src/main/java/com/zhgd/xmgl/modules/material/service/MaterialDetectionReportService.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.material.entity.MaterialDetectionReport;
import com.zhgd.xmgl.modules.material.entity.qo.DetectionDateQO;
import com.zhgd.xmgl.modules.material.entity.qo.MaterialDetectionReportQO;
import com.zhgd.xmgl.modules.material.entity.qo.SumQualifiedRatioVO;
@ -27,6 +28,6 @@ public interface MaterialDetectionReportService extends IService<MaterialDetecti
*/
SumQualifiedRatioVO getQualifiedRatio(String projectSn);
List<MaterialDetectionReport> limitByDetectionDate(String projectSn, Integer size);
List<MaterialDetectionReport> limitByDetectionDate(DetectionDateQO qo);
}

19
src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialApproachRecordServiceImpl.java Normal file
View File

@ -0,0 +1,19 @@
package com.zhgd.xmgl.modules.material.service.impl;
import com.zhgd.xmgl.modules.material.entity.MaterialApproachRecord;
import com.zhgd.xmgl.modules.material.mapper.MaterialApproachRecordMapper;
import com.zhgd.xmgl.modules.material.service.IMaterialApproachRecordService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 材料进场记录
* @author： zp
* @date： 2023-02-23
* @version： V1.0
*/
@Service
public class MaterialApproachRecordServiceImpl extends ServiceImpl<MaterialApproachRecordMapper, MaterialApproachRecord> implements IMaterialApproachRecordService {
}

17
src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java
View File

@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.xmgl.modules.material.entity.MaterialDetectionReport;
import com.zhgd.xmgl.modules.material.entity.qo.DetectionDateQO;
import com.zhgd.xmgl.modules.material.entity.qo.MaterialDetectionReportQO;
import com.zhgd.xmgl.modules.material.entity.qo.SumQualifiedRatioVO;
import com.zhgd.xmgl.modules.material.mapper.MaterialDetectionReportMapper;
import com.zhgd.xmgl.modules.material.service.MaterialDetectionReportService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -48,7 +50,8 @@ public class MaterialDetectionReportServiceImpl extends ServiceImpl<MaterialDete
// 更新时间 yyyy-MM-dd HH:mm:ss 之后
.ge(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getStartUpdateDate()), MaterialDetectionReport::getUpdateDate, materialDetectionReportQo.getStartUpdateDate())
// 更新时间 yyyy-MM-dd HH:mm:ss 之前
.le(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getEndUpdateDate()), MaterialDetectionReport::getUpdateDate, materialDetectionReportQo.getEndUpdateDate());
.le(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getEndUpdateDate()), MaterialDetectionReport::getUpdateDate, materialDetectionReportQo.getEndUpdateDate())
.eq(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getMaterialType()), MaterialDetectionReport::getMaterialType, materialDetectionReportQo.getMaterialType());
wrapper.orderByDesc(MaterialDetectionReport::getUpdateDate);
return materialDetectionReportMapper.selectPage(page, wrapper);
}
@ -68,10 +71,16 @@ public class MaterialDetectionReportServiceImpl extends ServiceImpl<MaterialDete
}
@Override
public List<MaterialDetectionReport> limitByDetectionDate(String projectSn, Integer size) {
public List<MaterialDetectionReport> limitByDetectionDate(DetectionDateQO qo) {
if (qo.getSize() == null) {
qo.setSize(10);
}
// 查询材料检验报告条件 根据需求调整
LambdaQueryWrapper<MaterialDetectionReport> wrapper = Wrappers.<MaterialDetectionReport>lambdaQuery().eq(MaterialDetectionReport::getProjectSn, projectSn);
LambdaQueryWrapper<MaterialDetectionReport> wrapper = Wrappers.<MaterialDetectionReport>lambdaQuery()
.eq(MaterialDetectionReport::getProjectSn, qo.getProjectSn())
.eq(StringUtils.isNoneBlank(qo.getFloor()), MaterialDetectionReport::getFloor, qo.getFloor())
.eq(StringUtils.isNoneBlank(qo.getEventType()), MaterialDetectionReport::getEventType, qo.getEventType());
wrapper.orderByDesc(MaterialDetectionReport::getDetectionDate);
return materialDetectionReportMapper.selectPage(new Page<>(1, size), wrapper).getRecords();
return materialDetectionReportMapper.selectPage(new Page<>(1, qo.getSize()), wrapper).getRecords();
}
}

3
src/main/java/com/zhgd/xmgl/modules/material/service/impl/MeasuredRealQuantityServiceImpl.java
View File

@ -44,7 +44,8 @@ public class MeasuredRealQuantityServiceImpl extends ServiceImpl<MeasuredRealQua
Integer measuredRealQuantityNumber = measuredRealQuantity.getMeasuredRealQuantityNumber();
Integer qualifiedNumber = measuredRealQuantity.getQualifiedNumber();
float qualifiedRatio = NumberUtil.round(qualifiedNumber * 100F / measuredRealQuantityNumber, 2).floatValue();
return new MeasuredRealQuantityVO(title, measuredRealQuantityNumber, qualifiedNumber, qualifiedRatio,measuredRealQuantity.getImageUrl(), measuredRealQuantity.getSurveyingDate());
return new MeasuredRealQuantityVO(title, measuredRealQuantityNumber, qualifiedNumber, qualifiedRatio,
measuredRealQuantity.getImageUrl(), measuredRealQuantity.getSurveyingDate(), measuredRealQuantity.getFloorName());
}).collect(Collectors.toList());
}
}

14
src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressTaskAlarmController.java
View File

@ -25,7 +25,7 @@ import java.util.List;
* @since 2022-11-02 11:18:41
*/
@RestController
@RequestMapping("progressTaskAlarm")
@RequestMapping("/")
@Api(tags = "进度甘特图-报警信息控制器")
public class ProgressTaskAlarmController {
/**
@ -41,7 +41,7 @@ public class ProgressTaskAlarmController {
* @param progressTaskAlarmQo 查询实体
* @return 分页查询进度甘特图-报警信息
*/
@GetMapping(value = "/selectPage")
@GetMapping(value = "xmgl/progressTaskAlarm/selectPage")
@ApiOperation(value = "分页查询进度甘特图-报警信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "current", value = "分页参数：当前页", dataType = "long", dataTypeClass = Long.class, defaultValue = "1", paramType = "query"),
@ -56,7 +56,7 @@ public class ProgressTaskAlarmController {
*
* @return 所有进度甘特图-报警信息
*/
@GetMapping(value = "/list")
@GetMapping(value = "progressTaskAlarm/list")
@ApiOperation(value = "所有进度甘特图-报警信息")
public Result<List<ProgressTaskAlarm>> list(ProgressTaskAlarm progressTaskAlarm) {
return Result.success(progressTaskAlarmService.list(new QueryWrapper<>(progressTaskAlarm)));
@ -68,7 +68,7 @@ public class ProgressTaskAlarmController {
* @param id 主键
* @return 进度甘特图-报警信息
*/
@GetMapping(value = "/getById")
@GetMapping(value = "progressTaskAlarm/getById")
@ApiOperation(value = "根据id查询进度甘特图-报警信息")
public Result<ProgressTaskAlarm> getById(Long id) {
return Result.success(progressTaskAlarmService.getById(id));
@ -80,7 +80,7 @@ public class ProgressTaskAlarmController {
* @param progressTaskAlarm 进度甘特图-报警信息
* @return 新增结果
*/
@PostMapping(value = "/addProgressTaskAlarm")
@PostMapping(value = "progressTaskAlarm/addProgressTaskAlarm")
@ApiOperation(value = "新增进度甘特图-报警信息")
public Result<ProgressTaskAlarm> addProgressTaskAlarm(@RequestBody ProgressTaskAlarm progressTaskAlarm) {
progressTaskAlarmService.save(progressTaskAlarm);
@ -93,7 +93,7 @@ public class ProgressTaskAlarmController {
* @param progressTaskAlarm 进度甘特图-报警信息
* @return 修改结果
*/
@PostMapping(value = "/updateProgressTaskAlarm")
@PostMapping(value = "progressTaskAlarm/updateProgressTaskAlarm")
@ApiOperation(value = "修改进度甘特图-报警信息")
public Result<ProgressTaskAlarm> updateProgressTaskAlarm(@RequestBody ProgressTaskAlarm progressTaskAlarm) {
progressTaskAlarmService.updateById(progressTaskAlarm);
@ -106,7 +106,7 @@ public class ProgressTaskAlarmController {
* @param id
* @return 删除结果
*/
@GetMapping(value = "/deleteById")
@GetMapping(value = "progressTaskAlarm/deleteById")
@ApiOperation(value = "根据id删除进度甘特图-报警信息")
public Result deleteById(Long id) {
return Result.success(progressTaskAlarmService.removeById(id));

13
src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java
View File

@ -8,6 +8,7 @@ import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.async.AsyncProject;
import com.zhgd.xmgl.entity.vo.ZwProjectDataVo;
import com.zhgd.xmgl.modules.project.entity.Project;
import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectType;
import com.zhgd.xmgl.modules.project.entity.vo.ProjectDurationVO;
import com.zhgd.xmgl.modules.project.service.IProjectService;
import com.zhgd.xmgl.util.MessageUtil;
@ -294,4 +295,16 @@ public class ProjectController {
public Result<ProjectDurationVO> getProjectDuration(String projectSn) {
return Result.success(projectService.getProjectDuration(projectSn));
}
/**
* 查询每个不同工程类别的名称、数量
*
* @param
* @return
*/
@ApiOperation(value = "查询每个不同工程类别的名称、数量", notes = "查询每个不同工程类别的名称、数量", httpMethod = "GET")
@GetMapping(value = "/groupBy/projectType")
public Result<List<GroupByProjectType>> groupByProjectType(Map<String, Object> map) {
return Result.success(projectService.groupByProjectType(map));
}
}

5
src/main/java/com/zhgd/xmgl/modules/project/entity/ProgressTask.java
View File

@ -136,11 +136,8 @@ public class ProgressTask implements Serializable {
@ApiModelProperty(value = "创建用户id")
private Long createUserId;
/**
* 状态，0未开始 ,1进行中，2已完成 默认未开始
*/
@TableField(value = "status")
@ApiModelProperty(value = "状态，0未开始 ,1进行中，2已完成 默认未开始")
@ApiModelProperty(value = "状态，1：提前 2正常 3延迟")
private Integer status;

6
src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java
View File

@ -233,4 +233,10 @@ public class Project implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "runde平台token")
private java.lang.String rundeToken;
/**
* 自定义的工程类别
*/
@ApiModelProperty(value = "自定义的工程类别")
private java.lang.String customProjectType;
}

2
src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectJqmDev.java
View File

@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.Accessors;
/**
@ -27,6 +28,7 @@ import lombok.experimental.Accessors;
@TableName(value = "project_jqm_dev")
@Accessors(chain = true)
@ApiModel(value = "ProjectJqmDev实体类", description = "ProjectJqmDev")
@ToString
public class ProjectJqmDev {
/**
* 金钱猫设备id

13
src/main/java/com/zhgd/xmgl/modules/project/entity/vo/ActualProgressVO.java
View File

@ -1,5 +1,7 @@
package com.zhgd.xmgl.modules.project.entity.vo;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -48,6 +50,14 @@ public class ActualProgressVO {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date actualStartDate;
/**
* 实际完成时间
*/
@TableField(value = "actual_finish_date", updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "实际完成时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date actualFinishDate;
/**
* 状态，1提前 ,2正常，3延迟
@ -55,11 +65,12 @@ public class ActualProgressVO {
@ApiModelProperty(value = "状态，1提前 ,2正常，3延迟")
private Integer status;
public ActualProgressVO(String taskName, Date startDate, Date finishDate, Date actualStartDate, Integer status) {
public ActualProgressVO(String taskName, Date startDate, Date finishDate, Date actualStartDate, Integer status,Date actualFinishDate) {
this.taskName = taskName;
this.startDate = startDate;
this.finishDate = finishDate;
this.actualStartDate = actualStartDate;
this.actualFinishDate = actualFinishDate;
this.status = status;
}
}

9
src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectType.java Normal file
View File

@ -0,0 +1,9 @@
package com.zhgd.xmgl.modules.project.entity.vo;
import lombok.Data;
@Data
public class GroupByProjectType {
private int count;
private String customProjectType;
}

3
src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.project.entity.Project;
import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectType;
import com.zhgd.xmgl.modules.project.entity.vo.ProjectDurationVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -77,4 +78,6 @@ public interface ProjectMapper extends BaseMapper<Project> {
* @return 项目工期
*/
ProjectDurationVO getProjectDuration(String projectSn);
List<GroupByProjectType> groupByProjectType(Map<String, Object> map);
}

9
src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
View File

@ -647,4 +647,13 @@
left join project_extend pe on p.project_sn = pe.project_sn
where p.project_sn = #{projectSn}
</select>
<select id="groupByProjectType" resultType="com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectType">
SELECT COUNT(p.project_id) AS count,p.custom_project_type
FROM
`project` p
GROUP BY
p.custom_project_type
HAVING
p.custom_project_type is NOT null
</select>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/project/service/IProjectService.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.entity.vo.ZwProjectDataVo;
import com.zhgd.xmgl.modules.project.entity.Project;
import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectType;
import com.zhgd.xmgl.modules.project.entity.vo.ProjectDurationVO;
import java.util.List;
@ -61,4 +62,6 @@ public interface IProjectService extends IService<Project> {
* @return 项目工期
*/
ProjectDurationVO getProjectDuration(String projectSn);
List<GroupByProjectType> groupByProjectType(Map<String, Object> map);
}

23
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java
View File

@ -403,20 +403,25 @@ public class ProgressTaskServiceImpl extends ServiceImpl<ProgressTaskMapper, Pro
}
return progressTaskList.stream().map(progressTask -> {
Date startDate = progressTask.getStartDate();
Date finishDate = progressTask.getFinishDate();
Date actualStartDate = progressTask.getActualStartDate();
Date actualFinishDate = progressTask.getActualFinishDate();
long datePeriod = finishDate.getTime() - startDate.getTime();
int status;
if (actualStartDate == null || (startDate.getTime() < actualStartDate.getTime())) {
// 实际开始时间晚于预计开始时间
status = 3;
} else if (startDate.getTime() > actualStartDate.getTime()) {
// 实际开始时间比预计开始时间早
//状态 1：提前 2正常 3延迟
if (actualStartDate != null && actualFinishDate != null && actualFinishDate.getTime() - actualStartDate.getTime() < datePeriod) {
//1：提前
status = 1;
} else {
// 实际开始时间等于预计开始时间
} else if ((actualStartDate == null && actualFinishDate == null) ||
(actualStartDate != null && actualFinishDate != null && actualFinishDate.getTime() - actualStartDate.getTime() == datePeriod) ||
(actualStartDate != null && actualFinishDate == null && System.currentTimeMillis() - actualStartDate.getTime() <= datePeriod)) {
//2正常
status = 2;
} else {
//3延迟
status = 3;
}
return new ActualProgressVO(progressTask.getTaskName(), startDate, progressTask.getFinishDate(), actualStartDate, status);
return new ActualProgressVO(progressTask.getTaskName(), startDate, progressTask.getFinishDate(), actualStartDate, status, actualFinishDate);
}).collect(Collectors.toList());
}

7
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java
View File

@ -32,6 +32,7 @@ import com.zhgd.xmgl.modules.environment.service.IEnvironmentDevService;
import com.zhgd.xmgl.modules.massrebound.service.IFunctionRoomService;
import com.zhgd.xmgl.modules.project.entity.Project;
import com.zhgd.xmgl.modules.project.entity.ProjectConfig;
import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectType;
import com.zhgd.xmgl.modules.project.entity.vo.ProjectDurationVO;
import com.zhgd.xmgl.modules.project.mapper.ProjectConfigMapper;
import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper;
@ -494,4 +495,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
return projectDuration;
}
@Override
public List<GroupByProjectType> groupByProjectType(Map<String, Object> map) {
List<GroupByProjectType> groupByProjectTypes = projectMapper.groupByProjectType(map);
return groupByProjectTypes;
}
}

37
src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java
View File

@ -1,17 +1,16 @@
package com.zhgd.xmgl.modules.quality.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 质量—检查部位
* @author： pds
@ -41,18 +40,24 @@ public class QualityRegion implements Serializable {
@ApiModelProperty(value="整改人ID")
private java.lang.Long dutyId ;
/**通知人*/
/**
* 通知人
*/
@Excel(name = "通知人", width = 15)
@ApiModelProperty(value="通知人ID")
private java.lang.String intendanceIds ;
/**父级区域ID*/
@ApiModelProperty(value = "通知人ID")
private java.lang.String intendanceIds;
/**
* 父级区域ID
*/
@Excel(name = "父级区域ID", width = 15)
@ApiModelProperty(value="父级区域ID")
private java.lang.Integer parentRegion ;
/**说明*/
@ApiModelProperty(value = "父级区域ID")
private java.lang.Long parentRegion;
/**
* 说明
*/
@Excel(name = "说明", width = 15)
@ApiModelProperty(value="说明")
private java.lang.String remark ;
@ApiModelProperty(value = "说明")
private java.lang.String remark;
/**项目唯一标识*/
@Excel(name = "项目唯一标识", width = 15)
@ApiModelProperty(value="项目唯一标识")

2
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
View File

@ -65,7 +65,7 @@ public class QualityRegionServiceImpl extends ServiceImpl<QualityRegionMapper, Q
@Override
public void addQualityRegion(QualityRegion qualityRegion) {
if(qualityRegion.getParentRegion()==null){
qualityRegion.setParentRegion(0);
qualityRegion.setParentRegion(0L);
}
Map<String, Object> param=new HashMap<>();
param.put("projectSn",qualityRegion.getProjectSn());

4
src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml
View File

@ -444,12 +444,12 @@
</select>
<select id="getAlarmData" resultType="com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord">
<!-- <select id="getAlarmData" resultType="com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord">
SELECT SUBSTRING_INDEX(GROUP_CONCAT(id ORDER BY id DESC), ",", 3) as names
FROM ai_analyse_hard_ware_alarm_record s
GROUP BY location
</select>
</select>-->
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/windowdisplay/controller/WindowDisplayController.java
View File

@ -74,7 +74,7 @@ public class WindowDisplayController {
@GetMapping(value = "/list")
@ApiOperation(value = "所有亮点展示")
public Result<List<WindowDisplay>> list(WindowDisplay windowDisplay) {
return Result.success(windowDisplayService.list(new LambdaQueryWrapper<>(windowDisplay).orderByDesc(WindowDisplay::getUpdateDate)));
return Result.success(windowDisplayService.list(new LambdaQueryWrapper<>(windowDisplay).orderByDesc(WindowDisplay::getUpdateDate).last("limit 4")));
}
/**

1
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -208,6 +208,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/api/main/alarm").permitAll()
.antMatchers("/zhgd/**").permitAll()
.antMatchers("/xmgl/lifter/list").permitAll()
.antMatchers("/xmgl/progressTask/downloadTemplate").permitAll() //进度管理系统-分布分项工程管理-下载模板
.antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
.anyRequest().authenticated() // 剩下所有的验证都需要验证
.and()

67
src/main/java/com/zhgd/xmgl/task/JinqianmaoTask.java
View File

@ -94,41 +94,41 @@ public class JinqianmaoTask {
}
public void getProjectNameNumberMap() {
List<CompanyConfig> companyConfigs = companyConfigMapper.selectList(new QueryWrapper<>());
for (CompanyConfig companyConfig:companyConfigs){
JSONObject jsonInfo = new JSONObject();
jsonInfo.put("StartIndex", 0);
jsonInfo.put("Count", 10000);
HttpResponse httpResponse = HttpRequest.post(getUrl("getProjectList",companyConfig.getUrl(),companyConfig.getAk(),companyConfig.getSecret()))
.body(jsonInfo.toJSONString())
.timeout(5 * 60 * 1000)
.execute();
log.info("请求第三方接口getProjectList响应体：{}", httpResponse);
if (httpResponse.getStatus() == HttpStatus.HTTP_OK && httpResponse.body() != null) {
JSONObject projectListData = JSON.parseObject(httpResponse.body());
JSONObject data = projectListData.getJSONObject("data");
if (data != null) {
JSONArray projectList = data.getJSONArray("data");
if (CollUtil.isNotEmpty(projectList)) {
List<Map<String, String>> nameIdList = new LinkedList<>();
for (int i = 0; i < projectList.size(); i++) {
HashMap<String, String> nameIdMap = new LinkedHashMap<>(2);
JSONObject project = projectList.getJSONObject(i);
nameIdMap.put("name", project.getString("prjName"));
nameIdMap.put("id", project.getString("proId"));
nameIdList.add(nameIdMap);
List<CompanyConfig> companyConfigs = companyConfigMapper.selectList(new QueryWrapper<>());
for (CompanyConfig companyConfig : companyConfigs) {
JSONObject jsonInfo = new JSONObject();
jsonInfo.put("StartIndex", 0);
jsonInfo.put("Count", 10000);
String url = getUrl("getProjectList", companyConfig.getUrl(), companyConfig.getAk(), companyConfig.getSecret());
String body = jsonInfo.toJSONString();
log.info("getProjectNameNumberMap()调用http：getProjectList，url：{},body:{}", url, body);
HttpResponse httpResponse = HttpRequest.post(url).body(body).timeout(5 * 60 * 1000).execute();
log.info("请求第三方接口getProjectList响应体：{}", httpResponse);
if (httpResponse.getStatus() == HttpStatus.HTTP_OK && httpResponse.body() != null) {
JSONObject projectListData = JSON.parseObject(httpResponse.body());
JSONObject data = projectListData.getJSONObject("data");
if (data != null) {
JSONArray projectList = data.getJSONArray("data");
if (CollUtil.isNotEmpty(projectList)) {
List<Map<String, String>> nameIdList = new LinkedList<>();
for (int i = 0; i < projectList.size(); i++) {
HashMap<String, String> nameIdMap = new LinkedHashMap<>(2);
JSONObject project = projectList.getJSONObject(i);
nameIdMap.put("name", project.getString("prjName"));
nameIdMap.put("id", project.getString("proId"));
nameIdList.add(nameIdMap);
}
nameIdList.forEach(nameIdMap -> projectService.update(Wrappers.<Project>lambdaUpdate().set(Project::getProjectNumber, nameIdMap.get("id")).eq(Project::getProjectName, nameIdMap.get("name"))));
log.info("getProjectNameNumberMap()的nameIdList：{}", nameIdList);
}
nameIdList.forEach(nameIdMap -> projectService.update(Wrappers.<Project>lambdaUpdate().set(Project::getProjectNumber, nameIdMap.get("id")).eq(Project::getProjectName, nameIdMap.get("name"))));
}
}
}
}
}
public void saveJqmDev() {
List<CompanyConfig> companyConfigs = companyConfigMapper.selectList(new QueryWrapper<>());
List<CompanyConfig> companyConfigs = companyConfigMapper.selectList(new QueryWrapper<>());
for (CompanyConfig companyConfig:companyConfigs){
List<Project> projectList = projectService.list(Wrappers.<Project>lambdaQuery().isNotNull(Project::getProjectNumber));
JSONObject jsonInfo = new JSONObject();
jsonInfo.put("StartIndex", 0);
@ -136,18 +136,18 @@ public class JinqianmaoTask {
for (Project project : projectList) {
String projectNumber = project.getProjectNumber();
jsonInfo.put("proId", projectNumber);
HttpResponse httpResponse = HttpRequest.post(getUrl("getDevList",companyConfig.getUrl(),companyConfig.getAk(),companyConfig.getSecret()))
.body(jsonInfo.toJSONString())
.timeout(5 * 60 * 1000)
.execute();
String url = getUrl("getDevList", companyConfig.getUrl(), companyConfig.getAk(), companyConfig.getSecret());
String body = jsonInfo.toJSONString();
log.info("saveJqmDev()调用http：url：{}；body：{}", url, body);
HttpResponse httpResponse = HttpRequest.post(url).body(body).timeout(5 * 60 * 1000).execute();
log.info("请求第三方接口getDevList响应体：{}", httpResponse);
if (httpResponse.getStatus() == HttpStatus.HTTP_OK && httpResponse.body() != null) {
JSONObject response = JSON.parseObject(httpResponse.body());
log.info("请求第三方接口getDevList响应体Data：{}", response.getJSONObject("data"));
if (response.getJSONObject("data") != null) {
JSONArray devList = response.getJSONObject("data").getJSONArray("data");
log.debug("devList：{}", devList);
if (CollUtil.isNotEmpty(devList)) {
List<ProjectJqmDev> projectJqmDevList = new LinkedList<>();
String date = DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN);
@ -161,7 +161,7 @@ public class JinqianmaoTask {
ProjectJqmDev projectJqmDev = projectJqmDevService.getOne(Wrappers.lambdaQuery(ProjectJqmDev.class)
.eq(ProjectJqmDev::getDevSn, devId).eq(ProjectJqmDev::getProjectNumber, projectNumber));
Integer curFloor = getCurFloor(projectNumber, devId,companyConfig.getUrl(),companyConfig.getAk(),companyConfig.getSecret());
Integer curFloor = getCurFloor(projectNumber, devId, companyConfig.getUrl(), companyConfig.getAk(), companyConfig.getSecret());
if (projectJqmDev != null) {
if (!Objects.equals(curFloor, projectJqmDev.getLastFloorCount())) {
asyncCommon.sendMqAndApp("楼层变动通知", "设备：" + devName + "的楼层发生变动，请及时进行巡检！", "楼层变动通知", project.getProjectSn(), "/pages/projectEnd/projectIndex/projectIndex");
@ -178,6 +178,7 @@ public class JinqianmaoTask {
projectJqmDevList.add(new ProjectJqmDev(null, projectNumber, project.getProjectSn(), project.getProjectName(), devId, devName, devType, devStatus, curFloor, date, date));
}
}
log.debug("saveBatch：projectJqmDevList:{}", projectJqmDevList);
projectJqmDevService.saveBatch(projectJqmDevList);
}
} else {

31
src/main/java/com/zhgd/xmgl/util/Base64.java
View File

@ -1,8 +1,11 @@
package com.zhgd.xmgl.util;
import org.apache.commons.codec.binary.Hex;
public class Base64 {
private static char[] alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".toCharArray();
private static byte[] codes = new byte[256];
private static char[] alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".toCharArray();
private static byte[] codes = new byte[256];
static {
for (int i = 0; i < 256; i++)
codes[i] = -1;
@ -69,14 +72,24 @@ public class Base64 {
throw new Error("miscalculated data length!");
return out;
}
public static void main(String argc[]){
/**
* base64转成16进制
*
* @return
*/
public static String decodeBase64ByHex(String base64) {
//解码
byte[] x = java.util.Base64.getDecoder().decode(base64);
return Hex.encodeHexString(x);
}
public static void main(String argc[]) {
// String encode = encodeBase64(KeyConstants.MICRO_ADMIN.getBytes());
// log.info(encode);
}
}

76
src/main/resources/application-gxlt-gsx.properties Normal file
View File

@ -0,0 +1,76 @@
http.port=18070
spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&&serverTimezone=Asia/Shanghai
spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V)
#server.port=6688
server.port=30246
basePath=C:/zhgdy/itbgpImage/
server.tomcat.basedir=C:/zhgdy/tempImage/
arcsoft.dllPath=C:/zhgdy/dll
security.enable=false
isGetStandardData=false
isGetEnvironmentData=false
isGetFaceFeatureDate=false
#\u6D77\u5EB7\u89C6\u9891\u62A5\u8B66\u56FE\u7247IP\u7AEF\u53E3\u66FF\u6362
video.alarm.newUrl=
wx-appid=
wx-AppSecret=
mqtt-scope=gxltTopic
serverUrl=http://182.90.224.237:7000
#\u89C6\u9891\u5206\u6790url
video-analysis-url=
#\u9ED8\u8BA4\u653F\u52A1\u521B\u5EFA\u9879\u76EE\u6240\u5C5E\u4F01\u4E1A
defaultZwComapnySn=
#\u6587\u4EF6\u5B58\u50A8\u914D\u7F6E
#\u9ED8\u8BA4\u4F7F\u7528\u7684\u5B58\u50A8\u5E73\u53F0
spring.file-storage.default-platform=local
#".min.jpg" #\u7F29\u7565\u56FE\u540E\u7F00\uFF0C\u4F8B\u5982\u3010.min.jpg\u3011\u3010.png\u3011
spring.file-storage.thumbnail-suffix=.jpg
# \u672C\u5730\u5B58\u50A8\uFF0C\u4E0D\u4F7F\u7528\u7684\u60C5\u51B5\u4E0B\u53EF\u4EE5\u4E0D\u5199
# \u5B58\u50A8\u5E73\u53F0\u6807\u8BC6
spring.file-storage.local[0].platform=local
#\u542F\u7528\u5B58\u50A8
spring.file-storage.local[0].enable-storage=true
#\u542F\u7528\u8BBF\u95EE\uFF08\u7EBF\u4E0A\u8BF7\u4F7F\u7528 Nginx \u914D\u7F6E\uFF0C\u6548\u7387\u66F4\u9AD8\uFF09
spring.file-storage.local[0].enable-access=false
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u4F8B\u5982\uFF1A\u201Chttp://127.0.0.1:6023/image/\u201D\uFF0C\u6CE8\u610F\u540E\u9762\u8981\u548C path-patterns \u4FDD\u6301\u4E00\u81F4\uFF0C\u201C/\u201D\u7ED3\u5C3E\uFF0C\u672C\u5730\u5B58\u50A8\u5EFA\u8BAE\u4F7F\u7528\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u65B9\u4FBF\u540E\u671F\u66F4\u6362\u57DF\u540D
spring.file-storage.local[0].domain=
# \u5B58\u50A8\u5730\u5740
spring.file-storage.local[0].base-path=C:/zhgdy/itbgpImage/
# \u8BBF\u95EE\u8DEF\u5F84\uFF0C\u5F00\u542F enable-access \u540E\uFF0C\u901A\u8FC7\u6B64\u8DEF\u5F84\u53EF\u4EE5\u8BBF\u95EE\u5230\u4E0A\u4F20\u7684\u6587\u4EF6
spring.file-storage.local[0].path-patterns=
spring.file-storage.aliyun-oss[0].platform=aliyun-oss
spring.file-storage.aliyun-oss[0].enable-storage=false
spring.file-storage.aliyun-oss[0].access-key=
spring.file-storage.aliyun-oss[0].secret-key=
spring.file-storage.aliyun-oss[0].end-point=
spring.file-storage.aliyun-oss[0].bucket-name=
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u6CE8\u610F\u201C/\u201D\u7ED3\u5C3E\uFF0C\u4F8B\u5982\uFF1Ahttps://abc.oss-cn-shanghai.aliyuncs.com/
spring.file-storage.aliyun-oss[0].domain=
spring.file-storage.aliyun-oss[0].base-path=
#\u5BA2\u6237\u7AEF License\u76F8\u5173\u914D\u7F6E
license.licensePath=C:/license_demo/client/license.lic
license.publicKeysStorePath=C:/license_demo/client/publicCerts.keystore
# admin\u4E2D\u5BF9\u5E94\u7684\u5730\u5740\u53CA\u5B9E\u4F8B\u540D
spring.boot.admin.client.instance.service-url=http://182.90.224.237:7000
spring.boot.admin.client.instance.name=gxlt
double-carbon.water-data-url=http://test.cesms.net
double-carbon.ammeter-data-url=http://test.cesms.net
server.ssl.enabled=false

73
src/main/resources/application-sjjt-gsx.properties Normal file
View File

@ -0,0 +1,73 @@
#http.port=30250
http.port=18070
#spring.datasource.url=jdbc:mysql://124.71.178.44:3306/wisdomsite_lgdc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
#spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC
#spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
#spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
#spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
spring.datasource.url=jdbc:mysql://116.169.63.183:33061/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
#spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V)
spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V)
server.port=8070
#server.port=30246
basePath=C:/jxj/prod/backEnd/itbgpImage/
server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/
#arcsoft.dllPath=D:/hz/wisdomSite/src/main/resources/dll
#basePath=F:/zhgd/itbgpImage/
#server.tomcat.basedir=F:/zhgd/tempImage/
#arcsoft.dllPath=F:/zhgd/dll
arcsoft.dllPath=C:/jxj/prod/backEnd/dll
security.enable=false
isGetStandardData=false
isGetEnvironmentData=false
isGetFaceFeatureDate=false
#\u6D77\u5EB7\u89C6\u9891\u62A5\u8B66\u56FE\u7247IP\u7AEF\u53E3\u66FF\u6362
video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url
video-analysis-url=
server.ssl.enabled=false
#\u9ED8\u8BA4\u653F\u52A1\u521B\u5EFA\u9879\u76EE\u6240\u5C5E\u4F01\u4E1A
defaultZwComapnySn=
#\u6587\u4EF6\u5B58\u50A8\u914D\u7F6E
#\u9ED8\u8BA4\u4F7F\u7528\u7684\u5B58\u50A8\u5E73\u53F0
spring.file-storage.default-platform=local
#".min.jpg" #\u7F29\u7565\u56FE\u540E\u7F00\uFF0C\u4F8B\u5982\u3010.min.jpg\u3011\u3010.png\u3011
spring.file-storage.thumbnail-suffix=.jpg
# \u672C\u5730\u5B58\u50A8\uFF0C\u4E0D\u4F7F\u7528\u7684\u60C5\u51B5\u4E0B\u53EF\u4EE5\u4E0D\u5199
# \u5B58\u50A8\u5E73\u53F0\u6807\u8BC6
spring.file-storage.local[0].platform=local
#\u542F\u7528\u5B58\u50A8
spring.file-storage.local[0].enable-storage=true
#\u542F\u7528\u8BBF\u95EE\uFF08\u7EBF\u4E0A\u8BF7\u4F7F\u7528 Nginx \u914D\u7F6E\uFF0C\u6548\u7387\u66F4\u9AD8\uFF09
spring.file-storage.local[0].enable-access=false
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u4F8B\u5982\uFF1A\u201Chttp://127.0.0.1:6023/image/\u201D\uFF0C\u6CE8\u610F\u540E\u9762\u8981\u548C path-patterns \u4FDD\u6301\u4E00\u81F4\uFF0C\u201C/\u201D\u7ED3\u5C3E\uFF0C\u672C\u5730\u5B58\u50A8\u5EFA\u8BAE\u4F7F\u7528\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u65B9\u4FBF\u540E\u671F\u66F4\u6362\u57DF\u540D
spring.file-storage.local[0].domain=
# \u5B58\u50A8\u5730\u5740
spring.file-storage.local[0].base-path=C:/jxj/prod/backEnd/itbgpImage/
# \u8BBF\u95EE\u8DEF\u5F84\uFF0C\u5F00\u542F enable-access \u540E\uFF0C\u901A\u8FC7\u6B64\u8DEF\u5F84\u53EF\u4EE5\u8BBF\u95EE\u5230\u4E0A\u4F20\u7684\u6587\u4EF6
spring.file-storage.local[0].path-patterns=
spring.file-storage.aliyun-oss[0].platform=aliyun-oss
spring.file-storage.aliyun-oss[0].enable-storage=false
spring.file-storage.aliyun-oss[0].access-key=
spring.file-storage.aliyun-oss[0].secret-key=
spring.file-storage.aliyun-oss[0].end-point=
spring.file-storage.aliyun-oss[0].bucket-name=
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u6CE8\u610F\u201C/\u201D\u7ED3\u5C3E\uFF0C\u4F8B\u5982\uFF1Ahttps://abc.oss-cn-shanghai.aliyuncs.com/
spring.file-storage.aliyun-oss[0].domain=
spring.file-storage.aliyun-oss[0].base-path=
# admin\u4E2D\u5BF9\u5E94\u7684\u5730\u5740\u53CA\u5B9E\u4F8B\u540D
spring.boot.admin.client.instance.service-url=http://localhost:18070
spring.boot.admin.client.instance.name=zjsj
# \u6C34\u7535\u6570\u636E\u63A8\u9001\u5730\u5740
double-carbon.water-data-url=http://test.cesms.net
double-carbon.ammeter-data-url=http://test.cesms.net
license.licensePath=C:/jxj/prod/backEnd/license/license.lic
license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore

73
src/main/resources/application-zjsj-prod.properties Normal file
View File

@ -0,0 +1,73 @@
#http.port=30250
http.port=18070
#spring.datasource.url=jdbc:mysql://124.71.178.44:3306/wisdomsite_lgdc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
#spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC
#spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
#spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
#spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
spring.datasource.url=jdbc:mysql://124.71.67.160:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
#spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V)
spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V)
server.port=8070
#server.port=30246
basePath=C:/jxj/prod/backEnd/itbgpImage/
server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/
#arcsoft.dllPath=D:/hz/wisdomSite/src/main/resources/dll
#basePath=F:/zhgd/itbgpImage/
#server.tomcat.basedir=F:/zhgd/tempImage/
#arcsoft.dllPath=F:/zhgd/dll
arcsoft.dllPath=C:/jxj/prod/backEnd/dll
security.enable=true
isGetStandardData=false
isGetEnvironmentData=false
isGetFaceFeatureDate=false
#\u6D77\u5EB7\u89C6\u9891\u62A5\u8B66\u56FE\u7247IP\u7AEF\u53E3\u66FF\u6362
video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url
video-analysis-url=
server.ssl.enabled=false
#\u9ED8\u8BA4\u653F\u52A1\u521B\u5EFA\u9879\u76EE\u6240\u5C5E\u4F01\u4E1A
defaultZwComapnySn=
#\u6587\u4EF6\u5B58\u50A8\u914D\u7F6E
#\u9ED8\u8BA4\u4F7F\u7528\u7684\u5B58\u50A8\u5E73\u53F0
spring.file-storage.default-platform=local
#".min.jpg" #\u7F29\u7565\u56FE\u540E\u7F00\uFF0C\u4F8B\u5982\u3010.min.jpg\u3011\u3010.png\u3011
spring.file-storage.thumbnail-suffix=.jpg
# \u672C\u5730\u5B58\u50A8\uFF0C\u4E0D\u4F7F\u7528\u7684\u60C5\u51B5\u4E0B\u53EF\u4EE5\u4E0D\u5199
# \u5B58\u50A8\u5E73\u53F0\u6807\u8BC6
spring.file-storage.local[0].platform=local
#\u542F\u7528\u5B58\u50A8
spring.file-storage.local[0].enable-storage=true
#\u542F\u7528\u8BBF\u95EE\uFF08\u7EBF\u4E0A\u8BF7\u4F7F\u7528 Nginx \u914D\u7F6E\uFF0C\u6548\u7387\u66F4\u9AD8\uFF09
spring.file-storage.local[0].enable-access=false
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u4F8B\u5982\uFF1A\u201Chttp://127.0.0.1:6023/image/\u201D\uFF0C\u6CE8\u610F\u540E\u9762\u8981\u548C path-patterns \u4FDD\u6301\u4E00\u81F4\uFF0C\u201C/\u201D\u7ED3\u5C3E\uFF0C\u672C\u5730\u5B58\u50A8\u5EFA\u8BAE\u4F7F\u7528\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u65B9\u4FBF\u540E\u671F\u66F4\u6362\u57DF\u540D
spring.file-storage.local[0].domain=
# \u5B58\u50A8\u5730\u5740
spring.file-storage.local[0].base-path=C:/jxj/prod/backEnd/itbgpImage/
# \u8BBF\u95EE\u8DEF\u5F84\uFF0C\u5F00\u542F enable-access \u540E\uFF0C\u901A\u8FC7\u6B64\u8DEF\u5F84\u53EF\u4EE5\u8BBF\u95EE\u5230\u4E0A\u4F20\u7684\u6587\u4EF6
spring.file-storage.local[0].path-patterns=
spring.file-storage.aliyun-oss[0].platform=aliyun-oss
spring.file-storage.aliyun-oss[0].enable-storage=false
spring.file-storage.aliyun-oss[0].access-key=
spring.file-storage.aliyun-oss[0].secret-key=
spring.file-storage.aliyun-oss[0].end-point=
spring.file-storage.aliyun-oss[0].bucket-name=
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u6CE8\u610F\u201C/\u201D\u7ED3\u5C3E\uFF0C\u4F8B\u5982\uFF1Ahttps://abc.oss-cn-shanghai.aliyuncs.com/
spring.file-storage.aliyun-oss[0].domain=
spring.file-storage.aliyun-oss[0].base-path=
# admin\u4E2D\u5BF9\u5E94\u7684\u5730\u5740\u53CA\u5B9E\u4F8B\u540D
spring.boot.admin.client.instance.service-url=http://localhost:18070
spring.boot.admin.client.instance.name=zjsj
# \u6C34\u7535\u6570\u636E\u63A8\u9001\u5730\u5740
double-carbon.water-data-url=http://test.cesms.net
double-carbon.ammeter-data-url=http://test.cesms.net
license.licensePath=C:/jxj/prod/backEnd/license/license.lic
license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore

2
src/main/resources/application.properties
View File

@ -1,5 +1,5 @@
# \u73AF\u5883\u9009\u62E9
spring.profiles.active=dev
spring.profiles.active=zjsj
#spring.profiles.active=dev6024
#spring.profiles.active=dev6025
#spring.profiles.active=hncs

BIN
src/main/resources/dll/libarcsoft_face.dll
View File

Binary file not shown.

BIN
src/main/resources/dll/libarcsoft_face_engine.dll
View File

Binary file not shown.

BIN
src/main/resources/dll/libarcsoft_face_engine_jni.dll
View File

Binary file not shown.