Skip to content

D
device-back
提交 af8bbc34 authored 作者: zjm's avatar zjm
浏览文件
操作

Merge branch 'bug' of git.yfzx.zjtys.com.cn:matrix/device-back

# Conflicts: # dev-blockcha/src/main/java/com/tykj/dev/blockcha/subject/service/impl/BlockChainUtilImpl.java
上级 4e324733 60aeb7df
显示空白字符变更
内嵌 并排
正在显示 包含 123 行增加 和 31 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBill.java
浏览文件 @ af8bbc34
......@@ -115,6 +115,7 @@ public class AllotBill {
* 出库附件文件名
*/
@ApiModelProperty(value = "出库附件文件名")
@Column(name = "file_name",columnDefinition = "TEXT")
private String fileName;
/**
* 出库附件文件地址URL
......@@ -126,6 +127,7 @@ public class AllotBill {
* 入库附件文件名
*/
@ApiModelProperty(value = "入库附件文件名")
@Column(name = "receive_file_name",columnDefinition = "TEXT")
private String receiveFileName;
/**
* 入库附件文件地址URL
......
dev-blockcha/src/main/java/com/tykj/dev/blockcha/subject/service/impl/BlockChainUtilImpl.java
浏览文件 @ af8bbc34
......@@ -4,6 +4,7 @@ import com.tykj.dev.blockcha.conf.BcUrl;
import com.tykj.dev.blockcha.subject.entity.*;
import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
......@@ -16,7 +17,7 @@ import java.util.UUID;
* 步骤：
* 1.构建请求参数
* 2.通过rest_template获取数据
* 测试
*
* @author LJJ cnljj1995@gmail.com
* on 2020-08-13
*/
......@@ -24,6 +25,9 @@ import java.util.UUID;
@Component
public class BlockChainUtilImpl implements BlockChainUtil {
@Value("${block.flag}")
public boolean flag;
private String SECRET_KEY = "3mdeM1dw2FfHrd5h6WAuhB3WYdDG6ZAgz96CcM1nzxbiYA8QaaZHW75Je9xKixTTD2rwujyb1gVUNPYm5W6FPZQ8";
private String SECRET_ID = "3yXRRiL9xsLfbt2kv7qRH2so6ChJX3rFkay7Njcsxfbp";
......@@ -72,13 +76,13 @@ public class BlockChainUtilImpl implements BlockChainUtil {
@Override
public BcText sendText(Integer index,Integer subCode, String content) {
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", content);
request.put("subCode", subCode);
request.put("apiSignature", ApiSignatureUtil.getApiSignature(request, SECRET_KEY));
switch (index){
switch (index) {
case 1:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.SEND_TEXT,
......@@ -115,34 +119,42 @@ public class BlockChainUtilImpl implements BlockChainUtil {
request,
BcText.class
);
// return new BcText().toData();
}else {
return new BcText().toData();
}
}
@Override
public BcText sendText(Integer subCode, String content) {
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", content);
request.put("subCode", subCode);
request.put("apiSignature", ApiSignatureUtil.getApiSignature(request, SECRET_KEY));
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.SEND_TEXT,
request,
BcText.class
);
}else {
return new BcText().toData();
}
}
@Override
public BcHash sendHash(Integer index,Integer subCode, String content) {
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", HexUtil.hex64(content));
request.put("subCode", subCode);
String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY);
log.info("apiSignature:{}",s);
log.info("apiSignature:{}", s);
request.put("apiSignature", s);
switch (index){
switch (index) {
case 1:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.SEND_HASH,
......@@ -180,11 +192,14 @@ public class BlockChainUtilImpl implements BlockChainUtil {
request,
BcHash.class
);
}else {
return new BcHash().toDate();
}
}
@Override
public BcHash sendHash(Integer subCode, String content) {
// if ("true".equals(this.useBlockcha)) {
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", HexUtil.hex64(content));
request.put("subCode", subCode);
......@@ -198,6 +213,10 @@ public class BlockChainUtilImpl implements BlockChainUtil {
BcHash.class
);
}
else {
return new BcHash().toDate();
}
}
@Override
public BcRecord fetchRecord(String recordId) {
......@@ -227,6 +246,8 @@ public class BlockChainUtilImpl implements BlockChainUtil {
@Override
public BcText appendText(Integer index,String content, String recordId) {
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", content);
request.put("recordID", recordId);
......@@ -234,7 +255,7 @@ public class BlockChainUtilImpl implements BlockChainUtil {
request.put("apiSignature", s);
switch (index){
switch (index) {
case 1:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_TEXT,
......@@ -267,11 +288,14 @@ public class BlockChainUtilImpl implements BlockChainUtil {
BLOCK_CHAIN_URL + BcUrl.APPEND_TEXT,
request,
BcText.class);
// return new BcText().toData();
}else {
return new BcText().toData();
}
}
@Override
public BcText appendText(String content, String recordId) {
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", content);
request.put("recordID", recordId);
......@@ -282,10 +306,15 @@ public class BlockChainUtilImpl implements BlockChainUtil {
BLOCK_CHAIN_URL + BcUrl.APPEND_TEXT,
request,
BcText.class);
}else {
return new BcText().toData();
}
}
@Override
public BcHash appendHash(Integer index,String content, String recordId) {
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", HexUtil.hex64(content));
request.put("recordID", recordId);
......@@ -293,7 +322,7 @@ public class BlockChainUtilImpl implements BlockChainUtil {
request.put("apiSignature", s);
switch (index){
switch (index) {
case 1:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_HASH,
......@@ -331,12 +360,16 @@ public class BlockChainUtilImpl implements BlockChainUtil {
request,
BcHash.class
);
// return new BcHash().toDate();
}else {
return new BcHash().toDate();
}
}
@Override
public BcHash appendHash(String content, String recordId) {
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", HexUtil.hex64(content));
request.put("recordID", recordId);
......@@ -348,7 +381,9 @@ public class BlockChainUtilImpl implements BlockChainUtil {
request,
BcHash.class
);
// return new BcHash().toDate();
}else {
return new BcHash().toDate();
}
}
@Override
......
dev-blockcha/src/main/java/com/tykj/dev/blockcha/subject/service/impl/BlockChainUtilImplLocal.java → dev-blockcha/src/main/java/com/tykj/dev/blockcha/subject/service/impl/BlockChainUtilImpl1.java
浏览文件 @ af8bbc34
......@@ -16,16 +16,13 @@
// * 步骤：
// * 1.构建请求参数
// * 2.通过rest_template获取数据
// *
// * 测试
// * @author LJJ cnljj1995@gmail.com
// * on 2020-08-13
// */
//@Slf4j
//@Component
//public class BlockChainUtilImplLocal implements BlockChainUtil {
//
//
//
//public class BlockChainUtilImpl1 implements BlockChainUtil {
//
//
// private String SECRET_KEY = "3mdeM1dw2FfHrd5h6WAuhB3WYdDG6ZAgz96CcM1nzxbiYA8QaaZHW75Je9xKixTTD2rwujyb1gVUNPYm5W6FPZQ8";
......@@ -118,6 +115,7 @@
// request,
// BcText.class
// );
//// return new BcText().toData();
// }
//
// @Override
......@@ -126,6 +124,7 @@
// request.put("content", content);
// request.put("subCode", subCode);
// request.put("apiSignature", ApiSignatureUtil.getApiSignature(request, SECRET_KEY));
//
// return new RestTemplate().postForObject(
// BLOCK_CHAIN_URL + BcUrl.SEND_TEXT,
// request,
......@@ -133,10 +132,6 @@
// );
// }
//
//// public static void main(String[] args) {
//// new BlockChainUtilImpl().sendHash(1,"阿斯顿好看");
//// }
//
//
// @Override
// public BcHash sendHash(Integer index,Integer subCode, String content) {
......@@ -202,10 +197,6 @@
// request,
// BcHash.class
// );
//// }
//// else {
//// return new BcHash(0, "", new BcHashData("000"));
//// }
// }
//
// @Override
......@@ -226,6 +217,7 @@
// SortedMap<Object, Object> request = getRequest();
// map.forEach(request::put);
// request.put("apiSignature", ApiSignatureUtil.getApiSignature(request, SECRET_KEY));
//
// return new RestTemplate().postForObject(
// BLOCK_CHAIN_URL + BcUrl.FETCH_HISTORY,
// request,
......@@ -275,6 +267,7 @@
// BLOCK_CHAIN_URL + BcUrl.APPEND_TEXT,
// request,
// BcText.class);
//// return new BcText().toData();
// }
//
// @Override
......@@ -338,6 +331,7 @@
// request,
// BcHash.class
// );
//// return new BcHash().toDate();
//
// }
//
......@@ -354,6 +348,7 @@
// request,
// BcHash.class
// );
//// return new BcHash().toDate();
// }
//
// @Override
......
dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java
浏览文件 @ af8bbc34
......@@ -509,6 +509,7 @@ public class MatchingDeviceController {
DeviceLogDto deviceLogDto = new DeviceLogDto(1, matchingDeviceEditVo.getMatchingDeviceId(), remark, null,null);
deviceLogService.addLog(deviceLogDto);
m.setType(matchingDeviceEditVo.getType());
m.setTypeName(matchingDeviceEditVo.getTypeName());
}
//添加绑定和解绑装备
//添加
......@@ -529,6 +530,16 @@ public class MatchingDeviceController {
m.setDeviceId(0);
}
if (matchingDeviceEditVo.getMatchingDeviceStorageLocation() != null &&
!m.getMatchingDeviceStorageLocation().equals(matchingDeviceEditVo.getMatchingDeviceStorageLocation())) {
//添加设备日志 存放位置
String remark = "将设备的存放位置改为" + matchingDeviceEditVo.getMatchingDeviceStorageLocation();
DeviceLogDto deviceLogDto = new DeviceLogDto(1, matchingDeviceEditVo.getMatchingDeviceId(), remark, null,null);
deviceLogService.addLog(deviceLogDto);
m.setMatchingDeviceStorageLocation(matchingDeviceEditVo.getMatchingDeviceStorageLocation());
m.setMatchingDeviceStorageLocationId(matchingDeviceEditVo.getMatchingDeviceStorageLocationId());
}
matchingDeviceLibraryService.update(m);
return ResponseEntity.ok("修改成功");
}
......
dev-rfid/src/main/java/com/tykj/dev/rfid/controller/AccessController.java
浏览文件 @ af8bbc34
......@@ -184,6 +184,7 @@ public class AccessController {
//对交集外的装备进行告警
LibraryWarningLog libraryWarningLog = new LibraryWarningLog();
libraryWarningLog.setUnit(userPublicService.findByUnitsToname(unitId));
libraryWarningLog.setUnitId(unitId);
libraryWarningLog.setInventoryResults("异常出库" + idList.size() + "台");
libraryWarningLog.setStatus("1");
libraryWarningLog.setWarningHandle(0);
......
dev-rfid/src/main/java/com/tykj/dev/rfid/controller/RfidController.java
浏览文件 @ af8bbc34
......@@ -379,6 +379,7 @@ public class RfidController {
RfidChangeLog rfidChangeLog = new RfidChangeLog(
d.getDeviceId(),
currentUserInfo.getUnits().getName(),
currentUserInfo.getUnitsId(),
currentUserInfo.getUserId(),
rfidChangeBillSaved.getUserBId(),
d.getOldRfidCardId(),
......
dev-rfid/src/main/java/com/tykj/dev/rfid/entity/domin/LibraryWarningLog.java
浏览文件 @ af8bbc34
......@@ -38,6 +38,9 @@ public class LibraryWarningLog {
@ApiModelProperty(value = "告警单位")
private String unit;
@ApiModelProperty(value = "告警单位Id")
private Integer unitId;
/**
* 告警状态
*/
......@@ -58,6 +61,7 @@ public class LibraryWarningLog {
* 盘点结果
*/
@ApiModelProperty(value = "异常情况（正常 新增X台 缺失X台）")
@Column(name = "inventory_results",columnDefinition ="TEXT")
private String inventoryResults;
/**
* 应有数量
......
dev-rfid/src/main/java/com/tykj/dev/rfid/entity/domin/LibraryWarningLogDetail.java
浏览文件 @ af8bbc34
......@@ -63,11 +63,13 @@ public class LibraryWarningLogDetail {
* 处理结果
*/
@ApiModelProperty(value = "处理结果")
@Column(name = "handle_results",columnDefinition ="TEXT")
private String handleResult;
/**
* 异常情况
*/
@ApiModelProperty(value = "异常情况")
@Column(name = "inventory_results",columnDefinition ="TEXT")
private String inventoryResults;
/**
* 创建用户id
......
dev-rfid/src/main/java/com/tykj/dev/rfid/entity/domin/RfidChangeLog.java
浏览文件 @ af8bbc34
......@@ -45,10 +45,15 @@ public class RfidChangeLog {
@ApiModelProperty(value = "对应装备ID")
private Integer deviceId;
/**
* 修改单位
* 修改单位名称
*/
@ApiModelProperty(value = "修改单位")
private String unit;
/**
* 修改单位id
*/
@ApiModelProperty(value = "修改单位ID")
private Integer unitId;
/**
* 修改人A
*/
......@@ -113,9 +118,10 @@ public class RfidChangeLog {
private String recordId;
public RfidChangeLog(Integer deviceId, String unit, Integer userAId, Integer userBId, String oldCardId, String newCardId, Integer rfidChangeBillId, Integer validTag) {
public RfidChangeLog(Integer deviceId, String unit, Integer unitId,Integer userAId, Integer userBId, String oldCardId, String newCardId, Integer rfidChangeBillId, Integer validTag) {
this.deviceId = deviceId;
this.unit = unit;
this.unitId = unitId;
this.userAId = userAId;
this.userBId = userBId;
this.oldCardId = oldCardId;
......
dev-rfid/src/main/java/com/tykj/dev/rfid/entity/vo/AccessData.java
浏览文件 @ af8bbc34
package com.tykj.dev.rfid.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
......@@ -8,8 +9,10 @@ import lombok.Data;
@Data
public class AccessData {
@ApiModelProperty(value = "命令")
private String cmd ;
@ApiModelProperty(value = "数据详情类")
private DataDetail data;
}
dev-rfid/src/main/java/com/tykj/dev/rfid/entity/vo/DataDetail.java
浏览文件 @ af8bbc34
package com.tykj.dev.rfid.entity.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
......@@ -8,10 +10,13 @@ import java.util.List;
* @author dengdiyi
*/
@Data
@ApiModel("数据详情类")
public class DataDetail {
@ApiModelProperty(value = "门禁名称")
private String deviceNo;
@ApiModelProperty(value = "IP地址")
private String ip;
private List<Record> epcs;
......
dev-rfid/src/main/java/com/tykj/dev/rfid/entity/vo/Record.java
浏览文件 @ af8bbc34
package com.tykj.dev.rfid.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class Record {
@ApiModelProperty(value = "标签的内容")
private String epc;
@ApiModelProperty(value = "报警时间")
private String alarmtime;
@ApiModelProperty(value = "允许出入库的方向 0为入 1为出")
private Integer direction;
}
dev-rfid/src/main/java/com/tykj/dev/rfid/service/AccessControlNameService.java
浏览文件 @ af8bbc34
......@@ -9,5 +9,10 @@ public interface AccessControlNameService {
AccessControlName add(AccessControlName accessControlName);
/**
* 根据门禁名称查询
* @param deviceNo 门禁名称
* @return 门禁名称对象
*/
AccessControlName getByDeviceNo(String deviceNo);
}
dev-rfid/src/main/java/com/tykj/dev/rfid/timeTask/InventoryScheduled.java
浏览文件 @ af8bbc34
......@@ -4,12 +4,14 @@ import com.module.interaction.ReaderHelper;
import com.tykj.dev.device.library.service.DeviceLibraryService;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
import com.tykj.dev.device.library.subject.vo.DeviceLibrarySelectVo;
import com.tykj.dev.device.user.subject.service.UnitsService;
import com.tykj.dev.rfid.entity.domin.LibraryWarningLog;
import com.tykj.dev.rfid.entity.domin.LibraryWarningLogDetail;
import com.tykj.dev.rfid.repository.LibraryWarningLogDetailDao;
import com.tykj.dev.rfid.service.LibraryWarningLogService;
import com.tykj.dev.rfid.service.RfidChangeBillService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.scheduling.support.CronTrigger;
import org.springframework.stereotype.Component;
......@@ -36,6 +38,10 @@ public class InventoryScheduled {
final LibraryWarningLogDetailDao libraryWarningLogDetailDao;
@Resource
DeviceLibraryService deviceLibraryService;
@Resource
private UnitsService unitsService;
InventoryThread inventoryThread = new InventoryThread();
// private String cron = "0 0/1 * * * ? ";
private String cron = "0 0 1 * * ?";
......@@ -97,13 +103,15 @@ public class InventoryScheduled {
//执行数据库操作
DeviceLibrarySelectVo deviceLibrarySelectVo = new DeviceLibrarySelectVo();
deviceLibrarySelectVo.setLifeStatus(Arrays.asList(2));
deviceLibrarySelectVo.setLocationUnit("省机要局");
// deviceLibrarySelectVo.setLocationUnit("省机要局");
deviceLibrarySelectVo.setUnitId(1);
deviceLibrarySelectVo.setLocationUnit(unitsService.findById(1).getName());
List<DeviceLibrary> list = deviceLibraryService.getListWithoutParent(deviceLibrarySelectVo);
//遍历判断结果
LibraryWarningLog libraryWarningLog = new LibraryWarningLog();
libraryWarningLog.setUnit("省机要局");
// libraryWarningLog.setUnit("省机要局");
libraryWarningLog.setUnitId(1);
libraryWarningLog.setUnit(unitsService.findById(1).getName());
libraryWarningLog.setStatus("0");
libraryWarningLog.setWarningType(2);
libraryWarningLog.setWarningHandle(0);
......
dev-union/src/main/resources/application-dev.properties
浏览文件 @ af8bbc34
......@@ -8,3 +8,4 @@ spring.jpa.hibernate.ddl-auto=update
# spring boot admin
spring.boot.admin.client.url=http://localhost:8769
spring.boot.admin.client.instance.serviceBaseUrl=http://localhost:8087w
block.flag=true
dev-union/src/main/resources/application-local.properties
浏览文件 @ af8bbc34
......@@ -7,3 +7,4 @@ logging.file=./log/equip.log
preview.path=http://124.70.145.101:8087/equip/file/
# spring boot admin
spring.boot.admin.client.url=http://localhost:8769
block.flag=true
\ No newline at end of file
dev-union/src/main/resources/application-prod.properties
浏览文件 @ af8bbc34
......@@ -7,3 +7,4 @@ spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
#file.path=/opt/zb/
#preview.path=http://10.153.4.11:8088/equip/file/
#preview.path=http://192.168.0.80:8088/equip/file/
block.flag=true
\ No newline at end of file
dev-union/src/main/resources/application-prodM.properties
浏览文件 @ af8bbc34
......@@ -7,3 +7,4 @@ spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
file.path=/opt/zb/
preview.path=http://10.153.4.11:8088/equip/file/
#preview.path=http://192.168.0.80:8088/equip/file/
block.flag=true
\ No newline at end of file
dev-union/src/main/resources/application-prodT.properties
浏览文件 @ af8bbc34
......@@ -7,3 +7,4 @@ spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
file.path=/opt/zb/
preview.path=http://10.153.4.11:8088/equipTest/file/
spring.jmx.enabled=false
block.flag=false
dev-union/src/main/resources/application-test.properties
浏览文件 @ af8bbc34
......@@ -9,3 +9,4 @@ file.path=/opt/zb/
preview.path=http://192.168.0.80:8088/equip/file/
spring.boot.admin.client.url=http://localhost:8769
spring.boot.admin.client.instance.serviceBaseUrl=http://localhost:8087
block.flag=true
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论