Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
huangzj
2023-08-21 13:39:05 +08:00
parent 91217219a4
commit af4c462843
9 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java
View File

@@ -88,10 +88,10 @@ public class DeviceUserController extends BaseController {
@ApiOperation("设备转移(直接扫码不用申请)")
@ApiImplicitParam(name = "ids", value = "设备Id集合", required = true)
@DeviceLog(operateType = DeviceOperate.TRANSFER)
public HttpResult<Boolean> transfer(@RequestParam("ids") List<String> ids){
public HttpResult<Boolean> transfer(@RequestParam("ids") List<String> ids,@RequestParam("useId") String useId){
String methodDescribe = getMethodDescribe("transfer");
Boolean flag = csDeviceUserPOService.transfer (ids);
Boolean flag = csDeviceUserPOService.transfer (ids,useId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppLineTopologyDiagramMapper.xml
View File

@@ -22,7 +22,7 @@
</select>
<select id="queryByLineIds" resultType="com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO">
select a.*,b.position linePostion from cs_line_topology_diagram a LEFT JOIN cs_line b on a.line_id=b.line_id where a.line_id in
select a.*,b.position linePostion,b.name name from cs_line_topology_diagram a LEFT JOIN cs_line b on a.line_id=b.line_id where a.line_id in
<foreach collection='lineIds' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java
View File

@@ -25,7 +25,7 @@ public interface CsDeviceUserPOService extends IService<CsDeviceUserPO>{
String isPrimaryUser(String deviceId);
Boolean transfer( List<String> ids);
Boolean transfer( List<String> ids,String useId);
Boolean delete(String eid);

1
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java
View File

@@ -86,6 +86,7 @@ public class AppLineTopologyDiagramServiceImpl extends ServiceImpl<AppLineTopolo
linePostionParam.getPointList().forEach(temp->{
csLinePOService.lambdaUpdate().eq(CsLinePO::getLineId,temp.getLineId()).set(CsLinePO::getName,temp.getName()).update();
this.lambdaUpdate().eq(AppLineTopologyDiagramPO::getId,temp.getId()).
eq(AppLineTopologyDiagramPO::getLineId,temp.getLineId()).set(AppLineTopologyDiagramPO::getLat,temp.getLat()).
set(AppLineTopologyDiagramPO::getLng,temp.getLng()).set(AppLineTopologyDiagramPO::getId,linePostionParam.getId()).update();

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
View File

@@ -209,8 +209,8 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
@Override
@Transactional(rollbackFor = {Exception.class})
public Boolean transfer(List<String> ids) {
String userIndex = RequestUtil.getUserIndex();
public Boolean transfer(List<String> ids,String useId) {
String userIndex = useId;
ids.forEach(eid->{
List<CsDeviceUserPO> list = this.lambdaQuery().eq(CsDeviceUserPO::getDeviceId, eid).eq(CsDeviceUserPO::getStatus,"1" ).list();
if(CollectionUtils.isEmpty(list)){