|
@@ -17,7 +17,6 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
|
|
|
|
-import java.sql.Date;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
@@ -94,13 +93,13 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<HookupComponentCompleteVo> getHookupComponentComplete(Integer siteId){
|
|
|
+ public List<HookupComponentCompleteVo> getHookupComponentComplete(Integer siteId) {
|
|
|
LambdaQueryWrapper<HookupComponentComplete> queryWrapper = Wrappers.lambdaQuery();
|
|
|
queryWrapper.eq(HookupComponentComplete::getSiteId, siteId);
|
|
|
List<HookupComponentComplete> hookupComponentComplete = hookupComponentCompleteService.list(queryWrapper);
|
|
|
List<HookupComponentCompleteVo> hookupComponentCompleteVoLsit = new ArrayList<HookupComponentCompleteVo>();
|
|
|
- if (hookupComponentComplete.size()>0){
|
|
|
- for (int i = 0; i < hookupComponentComplete.size(); i++){
|
|
|
+ if (hookupComponentComplete.size() > 0) {
|
|
|
+ for (int i = 0; i < hookupComponentComplete.size(); i++) {
|
|
|
HookupComponentCompleteVo hookupComponentCompleteVo = new HookupComponentCompleteVo();
|
|
|
hookupComponentCompleteVo.setId(hookupComponentComplete.get(i).getId());
|
|
|
hookupComponentCompleteVo.setSort(hookupComponentComplete.get(i).getSort());
|
|
@@ -119,9 +118,9 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
|
|
|
hookupComponentCompleteVo.setTableRowCount(hookupComponentComplete.get(i).getTableRowCount());
|
|
|
hookupComponentCompleteVo.setTableColCount(hookupComponentComplete.get(i).getTableColCount());
|
|
|
hookupComponentCompleteVo.setTableData(hookupComponentComplete.get(i).getTableData());
|
|
|
- if (hookupComponentComplete.get(i).getElementBool().equals("")){
|
|
|
+ if (hookupComponentComplete.get(i).getElementBool().equals("")) {
|
|
|
hookupComponentCompleteVo.setElementBool("");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
hookupComponentCompleteVo.setElementBool(hookupComponentComplete.get(i).getElementBool().split(","));
|
|
|
}
|
|
|
hookupComponentCompleteVo.setDeviceId(hookupComponentComplete.get(i).getDeviceId());
|
|
@@ -135,10 +134,10 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
|
|
|
|
|
|
@Override
|
|
|
@Transactional
|
|
|
- public void setHookupComponentComplete(List<HookupComponentCompleteOneVo> hookupComponentCompleteOneVoList){
|
|
|
+ public void setHookupComponentComplete(List<HookupComponentCompleteOneVo> hookupComponentCompleteOneVoList) {
|
|
|
try {
|
|
|
SysUser user = SecurityUtils.getLoginUser().getUser();
|
|
|
- for (int i = 0; i < hookupComponentCompleteOneVoList.size(); i++){
|
|
|
+ for (int i = 0; i < hookupComponentCompleteOneVoList.size(); i++) {
|
|
|
HookupComponentComplete hookupComponentComplete = new HookupComponentComplete();
|
|
|
hookupComponentComplete.setSort(hookupComponentCompleteOneVoList.get(i).getSort());
|
|
|
hookupComponentComplete.setTitle(hookupComponentCompleteOneVoList.get(i).getTitle());
|
|
@@ -155,14 +154,14 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
|
|
|
hookupComponentComplete.setAngle(hookupComponentCompleteOneVoList.get(i).getAngle());
|
|
|
hookupComponentComplete.setTableRowCount(hookupComponentCompleteOneVoList.get(i).getTableRowCount());
|
|
|
hookupComponentComplete.setTableColCount(hookupComponentCompleteOneVoList.get(i).getTableColCount());
|
|
|
- if (hookupComponentCompleteOneVoList.get(i).getTableData()==null){
|
|
|
+ if (hookupComponentCompleteOneVoList.get(i).getTableData() == null) {
|
|
|
hookupComponentComplete.setTableData("");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
hookupComponentComplete.setTableData(hookupComponentCompleteOneVoList.get(i).getTableData().toString());
|
|
|
}
|
|
|
- if (hookupComponentCompleteOneVoList.get(i).getElementBool()==null){
|
|
|
+ if (hookupComponentCompleteOneVoList.get(i).getElementBool() == null) {
|
|
|
hookupComponentComplete.setElementBool("");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
hookupComponentComplete.setElementBool(hookupComponentCompleteOneVoList.get(i).getElementBool().toString());
|
|
|
}
|
|
|
hookupComponentComplete.setSiteId(hookupComponentCompleteOneVoList.get(i).getSiteId());
|
|
@@ -173,9 +172,9 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
|
|
|
hookupComponentCompleteService.save(hookupComponentComplete);
|
|
|
}
|
|
|
|
|
|
- }catch (Exception e){
|
|
|
+ } catch (Exception e) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
- throw new BusinessException("数据错误,新增失败");
|
|
|
+ throw new BusinessException("数据错误,新增失败");
|
|
|
}
|
|
|
}
|
|
|
}
|