Merge branch 'dbdx' of http://192.168.1.43:3000/v2/zd-parents into dbdx

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabViolationServiceImpl.java

@@ -13,7 +13,6 @@ import com.zd.laboratory.domain.dto.LabViolationDTO;
 import com.zd.laboratory.domain.vo.*;
 import com.zd.laboratory.mapper.*;
 import com.zd.laboratory.service.ILabBlacklistService;
-import com.zd.laboratory.service.ILabNegativelistHistoryService;
 import com.zd.laboratory.service.ILabViolationService;
 import com.zd.laboratory.service.ILabViolationSiteService;
 import com.zd.model.domain.R;
@@ -41,9 +40,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
     private LabViolationMapper labViolationMapper;
 
     @Autowired
-    private LabSubjectManagerService subjectManagerService;
-
-    @Autowired
     private LabNegativeListRecordsMapper negativeListRecordsMapper;
 
     @Autowired
@@ -56,11 +52,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
     private RemoteExamService remoteExamService;
 
     @Autowired
-    private LabViolationHistoryRecordMapper violationHistoryMapper;
-
-    @Autowired
-    private ILabNegativelistHistoryService nhistoryService;
-    @Autowired
     private LabMessageContentMapper labMessageContentMapper;
 
     @Autowired
@@ -299,8 +290,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
 
 
         List<LabViolationScoreSite> scoreSites = selectLabScoreSiteList.selectLabScoreSiteList();
-
-//        List<SysDictData> dictList = DictUtils.getDictCache("lab_violation_rules");
         List<Object> violationList = new ArrayList<>();
         for (LabViolationScoreSite score : scoreSites) {
             violationList.add(score.getViolationName());
@@ -380,10 +369,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
 
     @Override
     public ResultData removeNegativelist(LabViolationVO labViolation) {
-        /*LabNegativelistHistory history = new LabNegativelistHistory();
-        history.setUserId(labViolation.getUserId());
-        history.setUserName(labViolation.getUserName());
-        history.setReason(labViolation.getReason());*/
         int row = negativeListRecordsMapper.delByUserId(labViolation.getUserId());
         if (row > 0) {
             int rows = labViolationMapper.updateviolaton(labViolation.getUserId());
@@ -646,8 +631,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
                 }
                 negativelistHistoryMapper.insertLabNegativelistHistory(nhistory);
             }
-
-
             return ResultData.success();
         }
 
@@ -695,7 +678,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
         if (vo.getWarningStatus() != null && vo.getWarningStatus() == 1) {
             //这里需要通知警告
             LabMessageContent labMessageContent = new LabMessageContent();
-//            labMessageContent.setSendMode(1);
             labMessageContent.setSendRange(3);
             labMessageContent.setMessClass(1);
             labMessageContent.setContent("违规行为警告，请严格遵守实验室安全管理制度。");
@@ -711,7 +693,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
         if (vo.getInterviewStatus() != null && vo.getInterviewStatus() == 1) {
             //这里需要约谈通知，具体需不需要保存字段，等周一讨论
             LabMessageContent labMessageContent = new LabMessageContent();
-//            labMessageContent.setSendMode(1);
             labMessageContent.setSendRange(3);
             labMessageContent.setMessClass(1);
             labMessageContent.setContent("联系负责老师进行安全教育约谈，请与" + handleDay.get(Calendar.YEAR) + "年" + (handleDay.get(Calendar.MONTH) + 1) + "月" + (handleDay.get(Calendar.DAY_OF_MONTH)) + "日之前完成。");
@@ -727,7 +708,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
         if (vo.getLearnStatus() != null && vo.getLearnStatus() == 1) {
 
             LabMessageContent labMessageContent = new LabMessageContent();
-//            labMessageContent.setSendMode(1);
             labMessageContent.setSendRange(3);
             labMessageContent.setMessClass(1);
             labMessageContent.setContent("完成课程学习，时长要求：" + vo.getLearnHour() + "小时" + vo.getLearnMinute() + "分钟" +
@@ -746,7 +726,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
         //考试状态
         if (vo.getTestStatus() != null && vo.getTestStatus() == 1) {
             LabMessageContent labMessageContent = new LabMessageContent();
-//            labMessageContent.setSendMode(1);
             labMessageContent.setSendRange(3);
             labMessageContent.setMessClass(1);
             labMessageContent.setContent("完成负面清单考试并考试合格，请与" + handleDay.get(Calendar.YEAR) + "年" + (handleDay.get(Calendar.MONTH) + 1) + "月" + (handleDay.get(Calendar.DAY_OF_MONTH)) + "日之前完成。");
@@ -761,7 +740,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
         //做题状态
         if (vo.getPracticeStatus() != null && vo.getPracticeStatus() == 1) {
             LabMessageContent labMessageContent = new LabMessageContent();
-//            labMessageContent.setSendMode(1);
             labMessageContent.setSendRange(3);
             labMessageContent.setMessClass(1);
             labMessageContent.setContent("模拟练习" + vo.getNumberTopics() + "道题，正确率：" + vo.getNumberAccuracy() + "%，" +
@@ -787,16 +765,8 @@ public class LabViolationServiceImpl implements ILabViolationService {
         history.setHandleDay(getExpireDate(vo.getHandleDay()));
         history.setLaboratoryId(vo.getLaboratoryId());
         history.setLaboratoryName(vo.getLaboratoryName());
-//        Long time = (vo.getLearnHour()*60*60)+(vo.getLearnMinute()*60);
-//        history.setLearnTime(time);
-//        history.setNumberAccuracy(vo.getNumberAccuracy());
-//        history.setNumberTopics(vo.getNumberTopics());
         history.setCreditScore(vo.getCreditScore());
         history.setOverStatus(0);
-//        history.setPracticeStatus(0);
-//        history.setTestStatus(0);
-//        history.setLearnStatus(0);
-//        history.setTreatmentMethod(vo.getTreatmentMethod());
         return history;
     }
 
@@ -841,7 +811,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
     @Override
     @Transactional
     public ResultData updateNegiveStatus(LabNegativeListRecordsVO vo) {
-        // LabNegativeListRecords records = negativeListRecordsMapper.findByUserId(vo.getId());
         negativeListRecordsMapper.deleteLabNegativeListRecordsById(vo.getId());
 
         LabNegativelistVO labNegativelistHistoryVo = new LabNegativelistVO();
@@ -849,9 +818,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
         List<LabNegativelistHistory> negativelistHistoryList = labNegativelistHistoryMapper.selectLabNegativelistHistoryList(labNegativelistHistoryVo);
 //        int limit = 0;
         for (LabNegativelistHistory history : negativelistHistoryList) {
-//            if(limit==1){
-//                break;
-//            }
             if (history.getLearnStatus().equals(0)) {
                 history.setLearnStatus(1);
             }
@@ -864,7 +830,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
             history.setUserId(null);
             history.setOverStatus(1);
             labNegativelistHistoryMapper.updateLabNegativelistHistory(history);
-//            limit++;
         }
 
         //更改状态，恢复信用分(如果此时信用分大于0，恢复时是否要累加，目前未累加)
@@ -878,24 +843,14 @@ public class LabViolationServiceImpl implements ILabViolationService {
         } else {
             recoveryMap.put("reason", "负面清单移除恢复信用分");
         }
-
         remoteExamService.recoveryPoints(recoveryMap);
-
         return ResultData.success();
-      /*  labViolationMapper.updateviolaton(vo.getJoinUserId());
-       int rows = negativeListRecordsMapper.updateNegativeStatus(vo.getJoinUserId());
-        if (rows > 0) {
-            this.resetCreditScore(vo.getJoinUserId());
-            return ResultData.success();
-        }
-        return ResultData.fail();*/
     }
 
 
     @Override
     @Transactional
     public ResultData updateNegiveStatusByPc(LabNegativeListRecordsVO vo) {
-        // LabNegativeListRecords records = negativeListRecordsMapper.findByUserId(vo.getId());
         negativeListRecordsMapper.deleteLabNegativeListRecordsById(vo.getId());
 
         LabNegativelistVO labNegativelistHistoryVo = new LabNegativelistVO();
@@ -903,9 +858,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
         List<LabNegativelistHistory> negativelistHistoryList = labNegativelistHistoryMapper.selectLabNegativelistHistoryList(labNegativelistHistoryVo);
 //        int limit = 0;
         for (LabNegativelistHistory history : negativelistHistoryList) {
-//            if(limit==1){
-//                break;
-//            }
             if (history.getLearnStatus().equals(0)) {
                 history.setLearnStatus(2);
             }
@@ -1042,9 +994,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
         if (labBlacklist.getJoinUserId() == null) {
             return ResultData.fail("条件不能为空");
         }
-      /*  LabViolation violation = labViolationMapper.selectByUserId(labBlacklist.getJoinUserId());
-        if (violation!=null) labViolationMapper.delByUserId(labBlacklist.getJoinUserId());*/
-        //Map <String, Object> pointsConfig = (Map <String, Object>) scoreData().getData();
         labBlacklistService.removeBlacklist(labBlacklist);
         //移除黑名单后更改状态并恢复信用分
         updateUsers(labBlacklist);
@@ -1057,9 +1006,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
         if (labBlacklist.getJoinUserId() == null) {
             return ResultData.fail("条件不能为空");
         }
-      /*  LabViolation violation = labViolationMapper.selectByUserId(labBlacklist.getJoinUserId());
-        if (violation!=null) labViolationMapper.delByUserId(labBlacklist.getJoinUserId());*/
-        //Map <String, Object> pointsConfig = (Map <String, Object>) scoreData().getData();
         labBlacklistService.removeBlacklistByPc(labBlacklist);
         //移除黑名单后更改状态并恢复信用分
         updateUsers(labBlacklist);
@@ -1127,13 +1073,9 @@ public class LabViolationServiceImpl implements ILabViolationService {
     @Override
     public ResultData exist() {
         Long userId = tokenService.getLoginUser().getUserid();
-//        Map<String, Object> p = new HashMap<>();
-//        p.put("userId",userId);
         LabViolationVO labViolation = new LabViolationVO();
         labViolation.setJoinUserId(userId);
         List<LabViolationVO> voList = labViolationMapper.pageList(labViolation);
-//        ResultData r = remoteExamService.findByUserId(p);
-//        List<Map> list = (List<Map>) r.getData();
         if (voList.size() > 0) {
             LabViolationVO violationVO = voList.get(0);
             if (violationVO.getStatus() == 1) {
@@ -1143,10 +1085,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
             }
         }
         return ResultData.fail();
-       /* LabViolationVO vo = new LabViolationVO();
-        vo.setUserId(userId);
-       List<LabViolationVO> violationList = labViolationMapper.selectLabViolationList(vo);
-        if (violationList!=null && violationList.size() > 0)*/
     }
 
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabViolationSiteServiceImpl.java

@@ -70,15 +70,7 @@ public class LabViolationSiteServiceImpl implements ILabViolationSiteService
          Map map =  obj;
         int row = 0;
          if (map.get("violationType")!=null) {
-//            List<Map<String, String>> siteList = (List<Map<String, String>>) map.get("violationType");
              labViolationSiteMapper.deleteLabViolationSiteAll();
-             // 需求变动，取消了原来的violationType字段类型参数
-//            siteList.forEach(s->{
-//                LabViolationSite site = new LabViolationSite();
-//                site.setViolationVal(s.get("violationVal"));
-//                site.setRemake(obj.get("remake").toString());
-//                labViolationSiteMapper.insertLabViolationSite(site);
-//            });
              LabViolationSite site = new LabViolationSite();
              site.setViolationVal("负面清单次数");
              site.setRemake(obj.get("remake").toString());

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabWarnPushMessageServiceImpl.java

@@ -10,6 +10,7 @@ import com.zd.laboratory.mapper.LabWarnPushMessageMapper;
 import com.zd.laboratory.service.ILabWarnPushMessageService;
 import com.zd.model.enums.WarnMessageTypeEnum;
 import com.zd.model.enums.WarnUserAttrEnum;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +24,7 @@ import java.util.stream.Stream;
  * @author zhoupan
  * @date 2021-10-06
  */
+@Slf4j
 @Service
 public class LabWarnPushMessageServiceImpl implements ILabWarnPushMessageService
 {
@@ -91,7 +93,7 @@ public class LabWarnPushMessageServiceImpl implements ILabWarnPushMessageService
                 labWarnPushMessage.setRecipientId(Long.parseLong(a));
                 insertLabWarnPushMessage(labWarnPushMessage);
             } catch (Exception e) {
-
+                log.error("异常信息：", e);
             }
         });
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabWhiteJoinSublistServiceImpl.java

@@ -55,10 +55,8 @@ public class LabWhiteJoinSublistServiceImpl implements ILabWhiteJoinSublistServi
      * @return 结果
      */
     @Override
-    public int insertLabWhiteJoinSublist(LabWhiteJoinSublist labWhiteJoinSublist)
-    {
+    public int insertLabWhiteJoinSublist(LabWhiteJoinSublist labWhiteJoinSublist) {
         //设置其他公共字段
-//        SaveUtil.setCommonAttr(labWhiteJoinSublist);
         return labWhiteJoinSublistMapper.insertLabWhiteJoinSublist(labWhiteJoinSublist);
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabWhitelistServiceImpl.java

@@ -116,10 +116,6 @@ public class LabWhitelistServiceImpl implements ILabWhitelistService
             a.setCreateTime(new Date());
             labWhiteJoinSublistMapper.insertLabWhiteJoinSublist(a);
         });
-
-        //haiKangDoorService.updateUserDoorByWhiteList(labWhitelistVo.getLabWhiteJoinSubList(),
-        //        labWhitelistVo.getUserId(), tokenService.getLoginUser());
-
         return 1;
     }
 
@@ -167,9 +163,6 @@ public class LabWhitelistServiceImpl implements ILabWhitelistService
 
             //删除白名单表数据
             count = labWhitelistMapper.deleteLabWhitelistById(id);
-            /*if(count > 0){
-                haiKangDoorService.deleteUserByAllDoor(labWhitelist.getUserId());
-            }*/
         }
 
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/SubQueryManager.java

@@ -12,7 +12,6 @@ import com.zd.laboratory.domain.LabSubject;
 import com.zd.laboratory.domain.SubDiyVO;
 import com.zd.laboratory.domain.vo.LabSubjectVO;
 import com.zd.laboratory.mapper.LabHazardSubjectRelationMapper;
-import com.zd.laboratory.mapper.LabRiskPlanAbnormalGroupMapper;
 import com.zd.laboratory.mapper.LabSubjectMapper;
 import com.zd.laboratory.service.ILabSubjectService;
 import com.zd.model.entity.SubQueryConfig;
@@ -21,7 +20,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import javax.validation.constraints.NotNull;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -48,12 +46,6 @@ public class SubQueryManager {
     @Autowired
     RedisService redisService;
 
-//    @Autowired
-//    private LabSubClassVO getNONELabSubClassVO;
-
-    @Autowired
-    private LabRiskPlanAbnormalGroupMapper riskPlanAbnormalGroupMapper;
-
     @Autowired
     private ILabSubjectService labSubjectService;
 
@@ -67,8 +59,7 @@ public class SubQueryManager {
      * @param ids 实验室ids
      * @return
      */
-    public List<SubDiyVO> querySubs(SubQueryConfig subQueryConfig, Long...ids)
-    {
+    public List<SubDiyVO> querySubs(SubQueryConfig subQueryConfig, Long...ids) {
         return querySubs(Arrays.asList(ids), subQueryConfig);
     }
     /**
@@ -79,12 +70,10 @@ public class SubQueryManager {
      * @param subIds 实验室ids
      * @return
      */
-    public List<SubDiyVO> querySubs(List<Long> subIds, SubQueryConfig subQueryConfig)
-    {
+    public List<SubDiyVO> querySubs(List<Long> subIds, SubQueryConfig subQueryConfig) {
         //根据ids 等查询条件获取实验室
         List<LabSubjectVO> labSubjectVOS = null;
-        if(subQueryConfig.getBaseInfo()==false)
-        {
+        if(subQueryConfig.getBaseInfo()==false) {
             //不查基础信息则不能查地址 以后可以考虑分开， 不要依赖基础信息
             subQueryConfig.setAddr(true);
             labSubjectVOS = subIds.stream().distinct().map(a -> {
@@ -93,11 +82,7 @@ public class SubQueryManager {
                 return subjectVO;
             }).collect(Collectors.toList());
         }
-//        else
-//        {
-            //根据ids 等查询条件获取实验室
-            labSubjectVOS = subjectMapper.selectLabSubjectVOListByIds(subIds, subQueryConfig.getSafeInfo());
-//        }
+        labSubjectVOS = subjectMapper.selectLabSubjectVOListByIds(subIds, subQueryConfig.getSafeInfo());
         return querySubs( subQueryConfig,labSubjectVOS);
     }
 
@@ -107,8 +92,7 @@ public class SubQueryManager {
      * @param subQueryConfig
      * @return
      */
-    public  List<SubDiyVO> querySubs(LabSubject labSubject, SubQueryConfig subQueryConfig)
-    {
+    public  List<SubDiyVO> querySubs(LabSubject labSubject, SubQueryConfig subQueryConfig) {
         List<LabSubjectVO> labSubjectVOS = null;
         //数据和业务权限
         if(SubQueryConfig.mode.data_business.equals(subQueryConfig.getQueryMode()))
@@ -179,8 +163,7 @@ public class SubQueryManager {
             }
 
             //查询基础信息时，查询安全信息。
-            if(subQueryConfig.getBaseInfo()&&subQueryConfig.getSafeInfo())
-            {
+            if(subQueryConfig.getBaseInfo()&&subQueryConfig.getSafeInfo()) {
                 //更新安全信息
                 SubDiyVO.SafeInfo safeInfo = ConversionSafeInfo(a, sys_hazard_category, sys_risk_measure, sys_extinguishing_key_points);
                 subDiyVO.setSafeInfo(safeInfo);
@@ -201,20 +184,6 @@ public class SubQueryManager {
         //查询危险等级,
         sw.stop();
         sw.start("调用异步任务");
-        //=====================危险等级开始 需求变更不需要了
-//        if(subQueryConfig.getDangerLevel())
-//        {
-//            CompletableFuture<Map<Long, LabSubClassVO>> mapListenableFuture = subjectManagerService.querySubClass(longs);
-//            completableFutures.add(mapListenableFuture);
-//            mapListenableFuture.thenAccept(a->{
-//                subDiyVOMap.entrySet().forEach(b->{
-//                    LabSubClassVO subClassVO = a.get(b.getKey());
-//                    b.getValue().setSubClassVO(subClassVO==null?getNONELabSubClassVO:subClassVO);
-//                });
-//            });
-//        }
-        //=====================危险等级结束
-
 
         //=====================地址开始
         if(subQueryConfig.getAddr())
@@ -271,8 +240,7 @@ public class SubQueryManager {
             });
         }
         Map<Long,Integer> countMap = new HashMap<>(longs.length);
-        if(subQueryConfig.getInitDangerCount())
-        {
+        if(subQueryConfig.getInitDangerCount()) {
             List<CommonCount>  commonCounts = labHazardSubjectRelationMapper.queryCountBySubIds(longs);
             commonCounts.forEach(a->{
                 countMap.put(a.getId(),a.getCount());
@@ -280,19 +248,11 @@ public class SubQueryManager {
         }
 
         subDiyVOList.forEach(c -> {
-
-
-            if(subQueryConfig.getBaseInfo())
-            {
-//                Map<String, String> subject_class = DictUtils.getDictCacheMap("subject_class");
+            if(subQueryConfig.getBaseInfo()) {
                 //设置字典:学科
                 String s = subject_class.get(c.getSubTypeValue());
                 c.setSubTypeLable(s);
-
-
-            }
-            else
-            {
+            } else {
                 if(subQueryConfig.getSafeInfo())
                 {
                     //更新安全信息
@@ -309,10 +269,6 @@ public class SubQueryManager {
 
 
         });
-
-
-
-
         sw.stop();
         CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[completableFutures.size()])).join();
         logger.info("子线程全部完成");
@@ -344,7 +300,6 @@ public class SubQueryManager {
         Optional.ofNullable(sub.getHazardCategory())
                 .map(a -> a.split(","))
                 .ifPresent(a -> {
-//                    List<SysDictData> sys_safety_warning = DictUtils.getDictCache("sys_hazard_category");
                     List<String> collect = Arrays.stream(a).map(b -> sys_hazard_category.get(b)).filter(b-> StrUtil.isNotBlank(b)).collect(Collectors.toList());
                     safeInfo.setHazardCategory(collect);
                 });
@@ -353,7 +308,6 @@ public class SubQueryManager {
                 .map(a -> a.split(","))
                 .ifPresent(a -> {
                     // 安全警示标示
-//                    List<SysDictData> sys_safety_warning = DictUtils.getDictCache("sys_risk_measure");
                     List<String> collect = Arrays.stream(a).map(b -> sys_risk_measure.get(b)).filter(b-> StrUtil.isNotBlank(b)).collect(Collectors.toList());
                     safeInfo.setRiskMeasure(collect);
                 });
@@ -362,7 +316,6 @@ public class SubQueryManager {
                 .map(a -> a.split(","))
                 .ifPresent(a -> {
                     // 安全警示标示
-//                    List<SysDictData> sys_safety_warning = DictUtils.getDictCache("sys_extinguishing_key_points");
                     List<String> collect = Arrays.stream(a).map(b -> sys_extinguishing_key_points.get(b)).filter(b-> StrUtil.isNotBlank(b)).collect(Collectors.toList());
                     safeInfo.setOutfire(collect);
                 });

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/WordService.java

@@ -258,7 +258,6 @@ public class WordService {
             if(deptSign == null){
                 deptSign = "";
             }else {
-                //deptSign = (isIntranet ? fileConfigUtils.getLocalUrl() :  fileConfigUtils.getRemoteUrl())  + deptSign;
                 deptSign = fileConfigUtils.getFileDomainApp() + deptSign;
             }
             word3.setCheck_dept_sign(new SignPictureRenderData(100, 100, deptSign, "图片加载失败", 300 ,-55));

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/service/impl/RelayState.java

@@ -153,8 +153,6 @@ public class RelayState implements BaseRouter {
                 log.info("时差大于10s，下发请求校时");
                 tracketPacket.order = "07";
                 tracketPacket.body = "8000";
-//                Channel channel = TCPServerHandler.channelMap.get(tracketPacket.deviceNumber);
-//                if (channel != null) {
                 String sendBody = tracketPacket.encodeString();
                 log.info(tracketPacket.deviceNumber + "  下发请求校时：" + sendBody);
                 return sendBody;